diff --git a/addons/account/account.py b/addons/account/account.py
index 84e951ba6a7..c3cd13a8115 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:'):
@@ -584,7 +580,7 @@ class account_journal(osv.osv):
     _name = "account.journal"
     _description = "Journal"
     _columns = {
-        'name': fields.char('Journal Name', size=64, required=True, translate=True),
+        'name': fields.char('Journal Name', size=64, required=True),
         'code': fields.char('Code', size=5, required=True, help="The code will be used to generate the numbers of the journal entries of this journal."),
         'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Cheques'), ('general', 'General'), ('situation', 'Opening/Closing Situation')], 'Type', size=32, required=True,
                                  help="Select 'Sale' for Sale journal to be used at the time of making invoice."\
@@ -688,7 +684,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
@@ -736,7 +732,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',
@@ -781,8 +777,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
@@ -792,11 +788,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)
@@ -814,7 +810,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)])
@@ -859,14 +855,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
 
@@ -887,13 +883,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?
@@ -909,7 +905,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:
@@ -921,7 +917,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:
@@ -947,7 +943,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']] = {
@@ -969,28 +965,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',
@@ -1041,8 +1037,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)
@@ -1061,7 +1055,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)
@@ -1070,7 +1064,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]
@@ -1131,8 +1125,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),
@@ -1142,8 +1136,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
@@ -1169,7 +1163,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
@@ -1194,7 +1188,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
@@ -1207,8 +1201,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:
@@ -1217,18 +1211,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]:
@@ -1268,8 +1265,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':'/',
@@ -1280,10 +1278,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"!') % \
@@ -1297,8 +1294,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)
@@ -1361,7 +1358,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']
 
@@ -1475,9 +1472,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:
@@ -1491,7 +1488,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)
@@ -1540,7 +1537,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:
@@ -1622,7 +1619,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
@@ -1726,7 +1723,7 @@ class account_tax(osv.osv):
         """
         if not args:
             args = []
-        if not context:
+        if context is None:
             context = {}
         ids = []
         if name:
@@ -2065,7 +2062,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'],
@@ -2171,13 +2168,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:
@@ -2189,9 +2186,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)
@@ -2200,8 +2197,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, {
@@ -2299,10 +2296,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']
@@ -2319,7 +2316,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'])
@@ -2341,6 +2338,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)
@@ -2466,16 +2465,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
@@ -2582,7 +2581,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]
@@ -2628,7 +2627,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,
@@ -2686,7 +2685,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])
@@ -2725,7 +2724,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]
@@ -2838,11 +2837,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
 
@@ -2935,7 +2934,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 9942708d5a3..e96b8b1f0fb 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 d487873ff20..5674567ffcf 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 8097cd334d0..2a9f24e953c 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
@@ -1186,11 +1192,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
@@ -1938,6 +1939,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
@@ -2835,7 +2841,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 ""
 
@@ -3283,17 +3292,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
@@ -3511,9 +3512,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
@@ -3809,9 +3818,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
@@ -3895,6 +3903,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
@@ -5363,6 +5381,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"
@@ -5534,6 +5557,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
@@ -5684,6 +5712,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"
@@ -6178,11 +6212,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."
@@ -6844,6 +6873,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
@@ -7368,11 +7402,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"
@@ -7536,6 +7565,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."
@@ -8532,13 +8566,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/ar.po b/addons/account/i18n/ar.po
index 0153705cec4..cd18488c252 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.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-14 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1009,6 +1009,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1934,7 +1939,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2651,6 +2656,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po
index f3ce1297b08..3da0baef515 100644
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.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-14 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1016,6 +1016,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1941,7 +1946,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2667,6 +2672,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Сума по основен код"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/br.po b/addons/account/i18n/br.po
index 89bf13f8979..d5ca0494c20 100644
--- a/addons/account/i18n/br.po
+++ b/addons/account/i18n/br.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-14 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2652,6 +2657,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index f23ccf51056..626851acee3 100644
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.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-14 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1020,6 +1020,11 @@ msgstr "Sedmica u godini"
 msgid "Landscape Mode"
 msgstr "Landscape mod"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1947,7 +1952,7 @@ msgstr "Otvori stavke"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2671,6 +2676,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Iznos osnovne šifre"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index 66821cebf3a..999383b6c38 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.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-14 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1025,6 +1025,11 @@ msgstr "Setmana de l'any"
 msgid "Landscape Mode"
 msgstr "Mode horitzontal"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1955,7 +1960,7 @@ msgstr "Obre assentaments"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2682,6 +2687,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Import codi base"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index 0cb7a7592ed..3dabe94f438 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.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-14 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1009,6 +1009,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1934,7 +1939,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2651,6 +2656,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index 7a0c102c092..4b8b76c1155 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.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-14 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1012,6 +1012,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1937,7 +1942,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2660,6 +2665,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index fe737740909..2010a7ca161 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/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-09 08:46+0000\n"
+"PO-Revision-Date: 2010-12-14 21:38+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:09+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1073,6 +1073,11 @@ msgstr "Woche eines Jahres"
 msgid "Landscape Mode"
 msgstr "Überblick"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -2031,9 +2036,12 @@ msgstr "Bearbeite Buchungen"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
+"Eine Gutschrift ist ein Beleg von Ihrem Lieferanten, der einen Teil oder "
+"sogar den gesamte Rechnungsbetrag auf Ihrem Konto beim Lieferanten als "
+"Gutschrift ausweist .."
 
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
@@ -2793,6 +2801,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Steuergrundlage Betrag"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
@@ -11488,14 +11501,6 @@ msgstr ""
 #~ msgid "UnknownError"
 #~ msgstr "UnbekannterFehler"
 
-#~ 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 ""
-#~ "Eine Gutschrift ist ein Beleg von Ihrem Lieferanten, der einen Teil oder "
-#~ "sogar den gesamte Rechnungsbetrag auf Ihrem Konto beim Lieferanten als "
-#~ "Gutschrift ausweist .."
-
 #~ msgid "The certificate ID of the module must be unique !"
 #~ msgstr "Die ID für das Zertifikat des Moduls sollte eindeutig sein !"
 
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index 74aa397355f..006bc2d21f9 100644
--- a/addons/account/i18n/el.po
+++ b/addons/account/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-14 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1032,6 +1032,11 @@ msgstr "Εβδομάδα Έτους"
 msgid "Landscape Mode"
 msgstr "Προβολή Τοπίου"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1965,7 +1970,7 @@ msgstr "Ανοικτές Εγγραφές"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2694,6 +2699,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Ποσό Βασικού Κώδικα"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index 7ee0c4030f7..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 03:42+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-14 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1057,6 +1057,11 @@ msgstr "Semana del año"
 msgid "Landscape Mode"
 msgstr "Modo horizontal"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -2011,7 +2016,7 @@ msgstr "Abrir asientos"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"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 abono de proveedor de es una factura rectificativa de su proveedor "
@@ -2761,6 +2766,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Importe código base"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
@@ -11364,3 +11374,10 @@ msgstr "¡No puede eliminar una cuenta que contiene asientos contables! "
 
 #~ msgid "Low Level"
 #~ msgstr "Nivel inferior"
+
+#~ msgid ""
+#~ "A supplier refund is a credit note from your supplier indicating that he "
+#~ "refunds part or totality of the invoice sent to you."
+#~ msgstr ""
+#~ "Un abono de proveedor de es una factura rectificativa de su proveedor "
+#~ "indicando que le abona parte o totalmente la factura que le fue enviada."
diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po
index 1e4d4f530c2..662d29a2feb 100644
--- a/addons/account/i18n/es_AR.po
+++ b/addons/account/i18n/es_AR.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-14 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1024,6 +1024,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr "Modo apaisado"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1954,7 +1959,7 @@ msgstr "Abrir asientos"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2681,6 +2686,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Importe de código base"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index c596faee390..9dc1cc03f42 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.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-14 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1026,6 +1026,11 @@ msgstr "Semana del Año"
 msgid "Landscape Mode"
 msgstr "Modo horizontal"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1953,7 +1958,7 @@ msgstr "Abrir Entradas"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2679,6 +2684,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Importe código base"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po
index a11bb566b7e..e0aaa9edb35 100644
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.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-14 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1009,6 +1009,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr "Rõhtpaigutus"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1934,7 +1939,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2651,6 +2656,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Basskoodi summa"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/eu.po b/addons/account/i18n/eu.po
index 571a4a36dc1..040cbba0beb 100644
--- a/addons/account/i18n/eu.po
+++ b/addons/account/i18n/eu.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-14 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2652,6 +2657,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/fa.po b/addons/account/i18n/fa.po
index 4aa1bfae7d1..f076738036a 100644
--- a/addons/account/i18n/fa.po
+++ b/addons/account/i18n/fa.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-14 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2652,6 +2657,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po
index 693ca6fb640..833456a59af 100644
--- a/addons/account/i18n/fi.po
+++ b/addons/account/i18n/fi.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-14 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1020,6 +1020,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr "Maisematila"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1948,7 +1953,7 @@ msgstr "Avoimet merkinnät"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2673,6 +2678,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Peruskoodin määrä"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 754514fbaed..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-12 07:11+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-14 05:09+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
@@ -1125,6 +1132,11 @@ msgstr "Semaine de l'année"
 msgid "Landscape Mode"
 msgstr "Mode paysage"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr "Compte de bilan - passif - compte de capital"
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1192,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
@@ -1338,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
@@ -1356,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
@@ -1433,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
@@ -1458,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
@@ -1527,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
@@ -1600,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
@@ -1749,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
@@ -1769,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
@@ -1810,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
@@ -1838,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
@@ -1858,7 +1877,7 @@ msgstr "Compte de provisions, pertes et profits"
 #. module: account
 #: 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
 #: view:account.invoice.report:0
@@ -1885,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
@@ -1922,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
@@ -2037,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
@@ -2051,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
@@ -2072,9 +2093,12 @@ msgstr "Écritures Ouvertes"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"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
@@ -2164,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
@@ -2194,7 +2223,7 @@ msgstr "Description"
 #: code:addons/account/installer.py:0
 #, python-format
 msgid "ECNJ"
-msgstr ""
+msgstr "ECNJ"
 
 #. module: account
 #: view:account.subscription:0
@@ -2345,6 +2374,9 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
 msgstr ""
+"Ne trouve pas de journal de type %s pour cette société. \n"
+"Vous pouvez en créer dans le menu : \n"
+"Configuration\\Comptabilité financière\\Comptes\\Journaux"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -2377,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
@@ -2463,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
@@ -2531,7 +2570,7 @@ msgstr ""
 #. module: account
 #: report:account.journal.period.print:0
 msgid "Label"
-msgstr ""
+msgstr "Libellé"
 
 #. module: account
 #: view:account.tax:0
@@ -2641,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
@@ -2656,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
@@ -2724,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
@@ -2789,12 +2834,19 @@ 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
 msgid "Base Code Amount"
 msgstr "Montant Hors Taxe"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr "Vue"
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
@@ -2807,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
@@ -2840,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
@@ -3027,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
@@ -3057,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
@@ -3162,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
@@ -3290,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
@@ -3444,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
@@ -3558,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
@@ -3578,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
@@ -3757,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
@@ -3842,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
@@ -3866,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
@@ -3876,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
@@ -3907,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
@@ -3941,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
@@ -3968,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
@@ -4052,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
@@ -4175,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
@@ -4490,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
@@ -4536,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
@@ -4579,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
@@ -4601,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
@@ -4689,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
@@ -4705,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
@@ -5119,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
@@ -5188,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
@@ -5219,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
@@ -5254,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
@@ -5295,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
@@ -5339,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
@@ -5366,6 +5478,8 @@ msgid ""
 "Streamlines invoice payment and creates hooks to plug automated payment "
 "systems in."
 msgstr ""
+"Simplifie le paiement des factures et crée points d'interface pour connecter "
+"des systèmes de paiement automatique."
 
 #. module: account
 #: field:account.payment.term.line,value:0
@@ -5413,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
@@ -5420,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
@@ -5428,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
@@ -5690,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
@@ -5897,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
@@ -5966,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
@@ -6011,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
@@ -6191,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
@@ -6355,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
@@ -6587,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
@@ -6657,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
@@ -6832,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
@@ -7071,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
@@ -7145,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
@@ -7269,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
@@ -7520,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
@@ -7560,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
@@ -7677,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
@@ -7744,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
@@ -7795,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
@@ -7876,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
@@ -7899,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
@@ -7915,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
@@ -7930,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
@@ -7949,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
@@ -8120,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
@@ -8152,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
@@ -8201,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
@@ -8346,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
@@ -8538,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
@@ -8622,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
@@ -8641,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
@@ -8923,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
@@ -9379,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
@@ -9427,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
@@ -9495,24 +9632,24 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
 msgid "Account Analytic Chart"
-msgstr ""
+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
 msgid "Statistic Reports"
-msgstr ""
+msgstr "Rapports statistiques"
 
 #. module: account
 #: field:account.installer,progress:0
 #: field:account.installer.modules,progress:0
 #: field:wizard.multi.charts.accounts,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progression de la Configuration"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -9523,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
@@ -9532,12 +9669,12 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "November"
-msgstr ""
+msgstr "novembre"
 
 #. module: account
 #: sql_constraint:account.account:0
 msgid "The code of the account must be unique per company !"
-msgstr ""
+msgstr "Le code du compte doit être unique par société."
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -9548,7 +9685,7 @@ msgstr "Le compte de revenu ou de dépense associé au produit sélectionné."
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
-msgstr ""
+msgstr "La date de l'écriture n'est pas dans la période définie."
 
 #. module: account
 #: field:account.subscription,period_total:0
@@ -9564,7 +9701,7 @@ msgstr "Journal Général"
 #. module: account
 #: view:account.invoice:0
 msgid "Search Invoice"
-msgstr ""
+msgstr "Rechercher une facture"
 
 #. module: account
 #: report:account.invoice:0
@@ -9574,7 +9711,7 @@ msgstr ""
 #: 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
@@ -9598,7 +9735,7 @@ msgstr "Informations générales"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Accounting Documents"
-msgstr ""
+msgstr "Documents comptables"
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
@@ -9614,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
@@ -9676,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
@@ -9725,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/gl.po b/addons/account/i18n/gl.po
index c9f9b6e49a6..399fc297968 100644
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.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-14 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr "Semana do ano"
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2652,6 +2657,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/gu.po b/addons/account/i18n/gu.po
index 8849192dc2a..319e5c3c7ea 100644
--- a/addons/account/i18n/gu.po
+++ b/addons/account/i18n/gu.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-14 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2652,6 +2657,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/he.po b/addons/account/i18n/he.po
index 0e6d41c55b6..1124f6bdab0 100644
--- a/addons/account/i18n/he.po
+++ b/addons/account/i18n/he.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-14 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2652,6 +2657,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/hi.po b/addons/account/i18n/hi.po
index 8c9530363d5..3716104217d 100644
--- a/addons/account/i18n/hi.po
+++ b/addons/account/i18n/hi.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-14 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2652,6 +2657,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index 36e3bd63f89..9d3eb4d6684 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.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-14 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1014,6 +1014,11 @@ msgstr "Tjedan"
 msgid "Landscape Mode"
 msgstr "Prosireni način"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1941,7 +1946,7 @@ msgstr "Otvori stavke"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2663,6 +2668,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Iznos osnvice"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 4adb2969e13..e626216b8ea 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.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-14 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1009,6 +1009,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr "Fekvő mód"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1934,7 +1939,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2651,6 +2656,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po
index 3706cb7c4c8..62e264e9d53 100644
--- a/addons/account/i18n/id.po
+++ b/addons/account/i18n/id.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-14 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr "Minggu dalam setahun"
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2652,6 +2657,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index b4b347fe64f..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-14 01:36+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-14 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1062,6 +1062,11 @@ msgstr "Settimana dell'anno"
 msgid "Landscape Mode"
 msgstr "Modalità Orizzontale"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -2012,7 +2017,7 @@ msgstr "Apri registrazioni"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 "Il rimborso da un fornitore consiste in una nota di credito che indica che "
@@ -2759,6 +2764,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Importo codice base"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
@@ -10553,3 +10563,10 @@ msgstr ""
 
 #~ msgid "Error ! You can not create recursive Menu."
 #~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
+
+#~ msgid ""
+#~ "A supplier refund is a credit note from your supplier indicating that he "
+#~ "refunds part or totality of the invoice sent to you."
+#~ msgstr ""
+#~ "Il rimborso da un fornitore consiste in una nota di credito che indica che "
+#~ "rimborsa in tutto od in parte una fattura che ha inviato."
diff --git a/addons/account/i18n/kab.po b/addons/account/i18n/kab.po
index ff9e514b4a5..e3995f255e7 100644
--- a/addons/account/i18n/kab.po
+++ b/addons/account/i18n/kab.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-14 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2652,6 +2657,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po
index 18e60c757a0..16829499ee5 100644
--- a/addons/account/i18n/ko.po
+++ b/addons/account/i18n/ko.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-14 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2652,6 +2657,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index 2fb05e2a863..c32604a3752 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.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-14 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1021,6 +1021,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr "Spausdinti horizontaliai"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1948,7 +1953,7 @@ msgstr "Atviri įrašai"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2669,6 +2674,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Bazės suma"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po
index cc77ab3fa95..477d01fb3c2 100644
--- a/addons/account/i18n/lv.po
+++ b/addons/account/i18n/lv.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-14 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2657,6 +2662,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index 9e0f7edf87b..da97d02b5aa 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.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-14 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1035,6 +1035,11 @@ msgstr "Жилийн долоо хоног"
 msgid "Landscape Mode"
 msgstr "Хэвтээ горим"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1978,7 +1983,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2716,6 +2721,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Суурь ангилалын дүн"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po
index 9f288936c1b..e9bf6b32a32 100644
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.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-14 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2652,6 +2657,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 5380a6be3f7..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-04 08:55+0000\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-14 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1043,6 +1043,11 @@ msgstr "Weeknummer"
 msgid "Landscape Mode"
 msgstr "Landschap modus"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1988,7 +1993,7 @@ msgstr "Open boekingen"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2720,6 +2725,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Basiscode bedrag"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr "Weergave"
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index 1eba0c41cd9..c05b35bcd15 100644
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.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-14 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1017,6 +1017,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr "Maak factuur volgens analytische rekeningen"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1942,7 +1947,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2665,6 +2670,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Basisbedrag"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po
index 47a79caac02..710a63f7968 100644
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.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-14 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr "Mode paysage"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2652,6 +2657,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index c97acef77cf..378927b73d5 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.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-14 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1056,6 +1056,11 @@ msgstr "Tydzień roku"
 msgid "Landscape Mode"
 msgstr "Poziomo"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1984,7 +1989,7 @@ msgstr "Zapisy otwarte"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2710,6 +2715,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Kwota do rejestru podstawy"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index 0e979399520..e6f445e66dd 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/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-10 17:14+0000\n"
-"PO-Revision-Date: 2010-12-13 23:22+0000\n"
-"Last-Translator: Paulino Ascenção <Unknown>\n"
+"PO-Revision-Date: 2010-12-14 22:42+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:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1048,6 +1048,11 @@ msgstr "Semana do ano"
 msgid "Landscape Mode"
 msgstr "Modo \"Landescape\""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1989,7 +1994,7 @@ msgstr "Movimentos em aberto"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2718,6 +2723,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Montante de código base"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index d465d1da177..77937cbd43e 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.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-14 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1042,6 +1042,11 @@ msgstr "Semana do Ano"
 msgid "Landscape Mode"
 msgstr "Modo paisagem"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1970,7 +1975,7 @@ msgstr "Lançamentos abertos"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2695,6 +2700,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Valor do código básico"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po
index 1ad5c891825..97bc1bbda48 100644
--- a/addons/account/i18n/ro.po
+++ b/addons/account/i18n/ro.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-14 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1022,6 +1022,11 @@ msgstr "Saptamana din an"
 msgid "Landscape Mode"
 msgstr "Mod vedere"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1950,7 +1955,7 @@ msgstr "Înregistrări deschise"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2676,6 +2681,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Suma cod bază"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index d45565981dc..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-13 13:54+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-14 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -105,7 +105,7 @@ msgstr ""
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Import from invoice or payment"
-msgstr ""
+msgstr "Импорт из счета или платежного поручения"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -256,7 +256,7 @@ msgstr ""
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
-msgstr ""
+msgstr "Счет '%s' оплачивается частично: %s%s из %s%s (%s%s остаток)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
@@ -277,7 +277,7 @@ msgstr "В не можете добавить/исправить проводк
 #. module: account
 #: view:account.bank.statement:0
 msgid "Calculated Balance"
-msgstr ""
+msgstr "Вычисленный баланс"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -294,7 +294,7 @@ msgstr ""
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
 msgid "Allow write off"
-msgstr ""
+msgstr "Разрешить списание"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -516,7 +516,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr ""
+msgstr "Счет используемый в этом журнале"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -887,7 +887,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total_tax:0
 msgid "Total With Tax"
-msgstr ""
+msgstr "Всего с налогом"
 
 #. module: account
 #: view:account.invoice:0
@@ -932,7 +932,7 @@ msgstr ""
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Bank statement"
-msgstr ""
+msgstr "Выписка банка"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
@@ -1016,6 +1016,11 @@ msgstr "Неделя года"
 msgid "Landscape Mode"
 msgstr "Режим: пейзаж"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1024,7 +1029,7 @@ msgstr "Счета заказчиков для утверждения"
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
 msgid "Select a Fiscal year to close"
-msgstr ""
+msgstr "Выбор финансового года для закрытия"
 
 #. module: account
 #: help:account.account,user_type:0
@@ -1195,12 +1200,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_entries_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
 msgid "Entries Analysis"
-msgstr ""
+msgstr "Анализ проводок"
 
 #. module: account
 #: field:account.account,level:0
 msgid "Level"
-msgstr ""
+msgstr "Уровень"
 
 #. module: account
 #: report:account.invoice:0
@@ -1221,7 +1226,7 @@ msgstr "Налоги"
 #: code:addons/account/wizard/account_report_common.py:0
 #, python-format
 msgid "Select a starting and an ending period"
-msgstr ""
+msgstr "Выберите начало и окончание периода"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -1231,7 +1236,7 @@ msgstr "Шаблоны счетов"
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
-msgstr ""
+msgstr "Искать шаблон налога"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -1255,7 +1260,7 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Initial Balance"
-msgstr ""
+msgstr "Начальный баланс"
 
 #. module: account
 #: view:account.invoice:0
@@ -1276,7 +1281,7 @@ msgstr "Параметры отчета"
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr ""
+msgstr "Анализ записей журнала"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_22
@@ -1326,7 +1331,7 @@ msgstr "С балансом не равным 0"
 #. module: account
 #: view:account.tax:0
 msgid "Search Taxes"
-msgstr ""
+msgstr "Искать налоги"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
@@ -1361,7 +1366,7 @@ msgstr "кол-во цифр"
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Manual Entries"
-msgstr ""
+msgstr "Пропускать состояние \"Черновик\" при ручном вводе проводок"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1372,12 +1377,12 @@ msgstr "Ввод проводки"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total:0
 msgid "Total Without Tax"
-msgstr ""
+msgstr "Всего без налога"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Entries "
-msgstr ""
+msgstr "кол-во проводок "
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
@@ -1432,7 +1437,7 @@ msgstr "Закрыто"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurring Entries"
-msgstr ""
+msgstr "Повторяющиеся проводки"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
@@ -1473,7 +1478,7 @@ msgstr "Без налога"
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to next partner"
-msgstr ""
+msgstr "Переход к следующему партнеру"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1540,7 +1545,7 @@ msgstr ""
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequence"
-msgstr ""
+msgstr "Последовательность финансовых лет"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
@@ -1550,7 +1555,7 @@ msgstr "Отдельные последовательности журнала"
 #. module: account
 #: view:account.invoice:0
 msgid "Responsible"
-msgstr ""
+msgstr "Ответственный"
 
 #. module: account
 #: report:account.overdue:0
@@ -1560,7 +1565,7 @@ msgstr "Подитог:"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
 msgid "Sales by Account Type"
-msgstr ""
+msgstr "Продажи по типу счета"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -1568,11 +1573,13 @@ msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
 msgstr ""
+"Отмена счета: Создается счет на возврат, проверьте и согласуйте его для "
+"отмены текущего счета."
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
-msgstr ""
+msgstr "Выставление счета"
 
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
@@ -1598,7 +1605,7 @@ msgstr ""
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr ""
+msgstr "Этот помощник будет менять валюту счета"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_chart
@@ -1611,7 +1618,7 @@ msgstr ""
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! You cannot define overlapping fiscal years"
-msgstr ""
+msgstr "Ошибка! Вы не можете определить перекрывающиеся отчетные года"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -1660,22 +1667,22 @@ msgstr ""
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr ""
+msgstr "Все партнеры"
 
 #. module: account
 #: report:account.move.voucher:0
 msgid "Ref. :"
-msgstr ""
+msgstr "Ссылка:"
 
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Analytic Account Charts"
-msgstr ""
+msgstr "Аналитические планы счетов"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "My Entries"
-msgstr ""
+msgstr "Мои проводки"
 
 #. module: account
 #: report:account.overdue:0
@@ -1686,7 +1693,7 @@ msgstr "Ссылка на клиента:"
 #: code:addons/account/account_cash_statement.py:0
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
-msgstr ""
+msgstr "Пользователь %s не имеет прав доступа к журналу %s !"
 
 #. module: account
 #: help:account.period,special:0
@@ -1742,7 +1749,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_invoice_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
 msgid "Invoices Analysis"
-msgstr ""
+msgstr "Анализ счетов"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
@@ -1752,7 +1759,7 @@ msgstr ""
 #. module: account
 #: view:account.installer:0
 msgid "Configure Fiscal Year"
-msgstr ""
+msgstr "Настройка финансового года"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
@@ -1768,7 +1775,7 @@ msgstr ""
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Запись журнала"
 
 #. module: account
 #: view:account.tax:0
@@ -1778,17 +1785,17 @@ msgstr ""
 #. module: account
 #: field:account.cashbox.line,subtotal:0
 msgid "Sub Total"
-msgstr ""
+msgstr "Подитог"
 
 #. module: account
 #: view:account.account:0
 msgid "Treasury Analysis"
-msgstr ""
+msgstr "Финансовый анализ"
 
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Ошибка ! Нельзя создать рекурсивные компании."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1799,7 +1806,7 @@ msgstr "Счет аналитики"
 #: code:addons/account/account_bank_statement.py:0
 #, python-format
 msgid "Please verify that an account is defined in the journal."
-msgstr ""
+msgstr "Пожалуйста, проверьте, что счет определен в журнале."
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
@@ -1816,7 +1823,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "Категория ТМЦ"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -1870,7 +1877,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_pl_report
 msgid "Account Profit And Loss"
-msgstr ""
+msgstr "Счет прибыли и убытков"
 
 #. module: account
 #: field:account.installer,config_logo:0
@@ -1892,13 +1899,13 @@ msgstr "Счета к получению"
 #. module: account
 #: report:account.move.voucher:0
 msgid "Canceled"
-msgstr ""
+msgstr "Отменено"
 
 #. module: account
 #: view:account.invoice:0
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Сумма до налогов"
 
 #. module: account
 #: help:account.tax,active:0
@@ -1941,7 +1948,7 @@ msgstr "Открытые проводки"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -1958,7 +1965,7 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
 msgid "Import from invoice"
-msgstr ""
+msgstr "Импорт из счета"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -1967,22 +1974,22 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #. module: account
 #: view:account.journal:0
 msgid "Validations"
-msgstr ""
+msgstr "Проверки"
 
 #. module: account
 #: model:account.journal,name:account.close_journal
 msgid "End of Year"
-msgstr ""
+msgstr "Конец года"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "This F.Year"
-msgstr ""
+msgstr "Этот фин. год"
 
 #. module: account
 #: view:account.tax.chart:0
@@ -2008,7 +2015,7 @@ msgstr "Проформа"
 #: code:addons/account/installer.py:0
 #, python-format
 msgid " Journal"
-msgstr ""
+msgstr " журнал"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -2072,13 +2079,13 @@ msgstr "Выполняется"
 #: field:product.category,property_account_income_categ:0
 #: field:product.template,property_account_income:0
 msgid "Income Account"
-msgstr ""
+msgstr "Cчёт доходов и расходов"
 
 #. module: account
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
-msgstr ""
+msgstr "Не определен журнал покупок / продаж."
 
 #. module: account
 #: view:product.category:0
@@ -2089,12 +2096,12 @@ msgstr "Установки бухгалтерии"
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted By"
-msgstr ""
+msgstr "Проводки отсортированы по"
 
 #. module: account
 #: field:account.change.currency,currency_id:0
 msgid "Change to"
-msgstr ""
+msgstr "Изменить на"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2104,7 +2111,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Шаблон ТМЦ"
 
 #. module: account
 #: report:account.account.balance:0
@@ -2143,7 +2150,7 @@ msgstr "Учетный год"
 #: help:account.report.general.ledger,fiscalyear_id:0
 #: help:account.vat.declaration,fiscalyear_id:0
 msgid "Keep empty for all open fiscal year"
-msgstr ""
+msgstr "Оставьте пустым"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move
@@ -2181,7 +2188,7 @@ msgstr "Отметьте данное поле"
 #. module: account
 #: view:account.common.report:0
 msgid "Filters"
-msgstr ""
+msgstr "Фильтры"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2200,7 +2207,7 @@ msgstr "Открыть"
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Draft state of an invoice"
-msgstr ""
+msgstr "Состояние счета - \"Черновик\""
 
 #. module: account
 #: help:account.account,reconcile:0
@@ -2268,7 +2275,7 @@ msgstr "Централизация Дебета"
 #: view:account.invoice.confirm:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_confirm
 msgid "Confirm Draft Invoices"
-msgstr ""
+msgstr "Подтвердить черновики счетов"
 
 #. module: account
 #: field:account.entries.report,day:0
@@ -2277,7 +2284,7 @@ msgstr ""
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "День"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_renew_view
@@ -2324,7 +2331,7 @@ msgstr "Выбрать период"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
 msgid "Statements"
-msgstr ""
+msgstr "Выписки"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -2337,17 +2344,19 @@ msgid ""
 "The fiscal position will determine taxes and the accounts used for the "
 "partner."
 msgstr ""
+"Система налогообложения будет определять налоги и счета используемые для "
+"партнера."
 
 #. module: account
 #: view:account.print.journal:0
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
-msgstr ""
+msgstr "Этот отчет дает вам обзор ситуации конкретного журнала"
 
 #. module: account
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Ошибка! Нельзя создать рекурсивные категории."
 
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
@@ -2377,7 +2386,7 @@ msgstr "Счет аналитического учета"
 #: model:ir.ui.menu,name:account.menu_action_account_form
 #: model:ir.ui.menu,name:account.menu_analytic
 msgid "Accounts"
-msgstr ""
+msgstr "Счета"
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -2389,7 +2398,7 @@ msgstr "Ошибка конфигурации!"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Средняя цена"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -2408,12 +2417,12 @@ msgstr ""
 #. module: account
 #: report:account.journal.period.print:0
 msgid "Label"
-msgstr ""
+msgstr "Метка"
 
 #. module: account
 #: view:account.tax:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "Бухгалтерская информация"
 
 #. module: account
 #: view:account.tax:0
@@ -2467,7 +2476,7 @@ msgstr "Базовый код возмещения"
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Bank Statements"
-msgstr ""
+msgstr "Банковские выписки"
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -2480,7 +2489,7 @@ msgstr "Истина"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Dates"
-msgstr ""
+msgstr "Даты"
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -2506,7 +2515,7 @@ msgstr ""
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries"
-msgstr ""
+msgstr "Бухгалтерские проводки"
 
 #. module: account
 #: report:account.journal.period.print:0
@@ -2541,12 +2550,12 @@ msgstr ""
 #: view:report.account.sales:0
 #: view:report.account_type.sales:0
 msgid "Sales by Account"
-msgstr ""
+msgstr "Продажи по бух. счетам"
 
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
-msgstr ""
+msgstr "Этот помощник создаст повторяющиеся бухгалтерские проводки"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -2574,7 +2583,7 @@ msgstr "Коды налогов"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_receivables
 msgid "Customers"
-msgstr ""
+msgstr "Заказчики"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -2590,7 +2599,7 @@ msgstr "Период по"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "August"
-msgstr ""
+msgstr "Август"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:0
@@ -2607,7 +2616,7 @@ msgstr ""
 #. module: account
 #: report:account.move.voucher:0
 msgid "Number:"
-msgstr ""
+msgstr "Номер:"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
@@ -2621,7 +2630,7 @@ msgstr "Ссылка"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
 #. module: account
 #: help:account.move.line,quantity:0
@@ -2664,6 +2673,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
@@ -2686,7 +2700,7 @@ msgstr "Финансы  и бухгалтерия"
 #: view:account.pl.report:0
 #: model:ir.ui.menu,name:account.menu_account_pl_report
 msgid "Profit And Loss"
-msgstr ""
+msgstr "Прибыль и убыток"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -2724,6 +2738,8 @@ msgid ""
 "No fiscal year defined for this date !\n"
 "Please create one."
 msgstr ""
+"Не определен финансовый год !\n"
+"Пожалуйста определите."
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -2750,12 +2766,12 @@ msgstr "Пользователь ответственный за этот жур
 #. module: account
 #: view:account.period:0
 msgid "Search Period"
-msgstr ""
+msgstr "Искать период"
 
 #. module: account
 #: view:account.change.currency:0
 msgid "Invoice Currency"
-msgstr ""
+msgstr "Валюта счета"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -2805,17 +2821,17 @@ msgstr "Название строки"
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Search Fiscalyear"
-msgstr ""
+msgstr "Искать финансовый год"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Always"
-msgstr ""
+msgstr "Всегда"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Total Quantity"
-msgstr ""
+msgstr "Общее количество"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
@@ -2847,7 +2863,7 @@ msgstr "Вид"
 #: code:addons/account/installer.py:0
 #, python-format
 msgid "BNK"
-msgstr ""
+msgstr "БНК"
 
 #. module: account
 #: field:account.move.line,analytic_lines:0
@@ -2882,7 +2898,7 @@ msgstr ""
 #. module: account
 #: help:account.journal.column,sequence:0
 msgid "Gives the sequence order to journal column."
-msgstr ""
+msgstr "Определяет последовательность колонок журнала."
 
 #. module: account
 #: view:account.tax.template:0
@@ -2973,7 +2989,7 @@ msgstr "Журналы"
 #. module: account
 #: field:account.partner.reconcile.process,to_reconcile:0
 msgid "Remaining Partners"
-msgstr ""
+msgstr "Остальные партнеры"
 
 #. module: account
 #: view:account.subscription:0
@@ -2995,13 +3011,13 @@ msgstr "Закупка"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_installer
 msgid "Accounting Application Configuration"
-msgstr ""
+msgstr "Настройка бухгалтерского учета"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
 #: model:ir.ui.menu,name:account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr ""
+msgstr "Панель бухг. аналитики"
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
@@ -3024,7 +3040,7 @@ msgstr "Закрыть период"
 #. module: account
 #: field:account.analytic.balance,empty_acc:0
 msgid "Empty Accounts ? "
-msgstr ""
+msgstr "Пустые счета ? "
 
 #. module: account
 #: report:account.overdue:0
@@ -3041,7 +3057,7 @@ msgstr ""
 #. module: account
 #: report:account.move.voucher:0
 msgid "Journal:"
-msgstr ""
+msgstr "Журнал:"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3061,7 +3077,7 @@ msgstr "Черновик"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
 msgid "Accounting Chart Configuration"
-msgstr ""
+msgstr "Настройка плана счетов"
 
 #. module: account
 #: field:account.tax.code,notprintable:0
@@ -3083,7 +3099,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
 msgid "Pending Invoice"
-msgstr ""
+msgstr "Счет в ожидании"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -3106,12 +3122,12 @@ msgstr ""
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
-msgstr ""
+msgstr "Нельзя удалить открытый или оплаченный счет !"
 
 #. module: account
 #: report:account.account.balance.landscape:0
 msgid "Total :"
-msgstr ""
+msgstr "Всего:"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
@@ -3179,18 +3195,18 @@ msgstr ""
 #. module: account
 #: view:account.journal:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Данные выставления счетов"
 
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice State"
-msgstr ""
+msgstr "Состояние счета"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "Категория продукции"
 
 #. module: account
 #: view:account.move:0
@@ -3204,7 +3220,7 @@ msgstr ""
 #: view:account.addtmpl.wizard:0
 #: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
 msgid "Create Account"
-msgstr ""
+msgstr "Создать счет"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_type_sales
@@ -3312,7 +3328,7 @@ msgstr "Не сверено"
 #: code:addons/account/wizard/account_fiscalyear_close.py:0
 #, python-format
 msgid "The journal must have default credit and debit account"
-msgstr ""
+msgstr "Журнал должен иметь дебитовый и кредитовый счет по умолчанию"
 
 #. module: account
 #: view:account.chart.template:0
@@ -3350,7 +3366,7 @@ msgstr "Счет налога"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
 msgid "Budgets"
-msgstr ""
+msgstr "Бюджеты"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -3369,7 +3385,7 @@ msgstr ""
 #: selection:account.report.general.ledger,filter:0
 #: selection:account.vat.declaration,filter:0
 msgid "No Filters"
-msgstr ""
+msgstr "Нет фильтров"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -3379,7 +3395,7 @@ msgstr ""
 #. module: account
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "История"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -3399,12 +3415,12 @@ msgstr "Применимый код (если тип=код)"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,product_qty:0
 msgid "Qty"
-msgstr ""
+msgstr "Кол-во"
 
 #. module: account
 #: field:account.invoice.report,address_contact_id:0
 msgid "Contact Address Name"
-msgstr ""
+msgstr "Адрес и имя контакта"
 
 #. module: account
 #: field:account.move.line,blocked:0
@@ -3443,7 +3459,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
 msgid "Account balance"
-msgstr ""
+msgstr "Баланс счета"
 
 #. module: account
 #: report:account.invoice:0
@@ -3455,7 +3471,7 @@ msgstr "Цена за ед."
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "Unable to change tax !"
-msgstr ""
+msgstr "Невозможно изменить налог !"
 
 #. module: account
 #: field:analytic.entries.report,nbr:0
@@ -3479,7 +3495,7 @@ msgstr "Тип счета"
 #. module: account
 #: view:account.state.open:0
 msgid "Open Invoice"
-msgstr ""
+msgstr "Открыть счет"
 
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
@@ -3523,7 +3539,7 @@ msgstr ""
 #. module: account
 #: help:account.journal,analytic_journal_id:0
 msgid "Journal for analytic entries"
-msgstr ""
+msgstr "Журнал аналитических проводок"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree3
@@ -3557,7 +3573,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "General Accounting"
-msgstr ""
+msgstr "Общий учет"
 
 #. module: account
 #: report:account.overdue:0
@@ -3618,12 +3634,12 @@ msgstr ""
 #. module: account
 #: view:account.invoice.confirm:0
 msgid "Confirm Invoices"
-msgstr ""
+msgstr "Подтвердить счета"
 
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "Average Rate"
-msgstr ""
+msgstr "Средний курс"
 
 #. module: account
 #: view:account.state.open:0
@@ -3681,7 +3697,7 @@ msgstr "Аналитический баланс"
 #: code:addons/account/report/account_profit_loss.py:0
 #, python-format
 msgid "Net Loss"
-msgstr ""
+msgstr "Чистый убыток"
 
 #. module: account
 #: help:account.account,active:0
@@ -3698,7 +3714,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
 msgid "Draft Entries"
-msgstr ""
+msgstr "Черновые проводки"
 
 #. module: account
 #: field:account.account,shortcut:0
@@ -3726,7 +3742,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
 msgid "Cancel the Selected Invoices"
-msgstr ""
+msgstr "Отменить выбранные счета"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -3754,7 +3770,7 @@ msgstr ""
 #. module: account
 #: view:account.entries.report:0
 msgid "Acc.Type"
-msgstr ""
+msgstr "Тип счета"
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -3814,7 +3830,7 @@ msgstr ""
 #: code:addons/account/account_analytic_line.py:0
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Счет расходов не определен для этого товара: \"%s\" (id:%d)"
 
 #. module: account
 #: view:res.partner:0
@@ -3845,18 +3861,18 @@ msgstr "Описание налога"
 #: selection:account.tax.chart,target_move:0
 #: selection:account.vat.declaration,target_move:0
 msgid "All Posted Entries"
-msgstr ""
+msgstr "Все добавленные проводки"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:0
 #, python-format
 msgid "Statement %s is confirmed, journal items are created."
-msgstr ""
+msgstr "Документ %s подтвержден, записи в журнал сделаны."
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The duration of the Fiscal Year is invalid. "
-msgstr ""
+msgstr "Ошибка ! Неверная продолжительность финансового года. "
 
 #. module: account
 #: field:report.aged.receivable,name:0
@@ -3871,7 +3887,7 @@ msgstr ""
 #. module: account
 #: view:account.account.template:0
 msgid "Default taxes"
-msgstr ""
+msgstr "Налоги по умолчанию"
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -3894,7 +3910,7 @@ msgstr ""
 #. module: account
 #: field:account.journal,view_id:0
 msgid "Display Mode"
-msgstr ""
+msgstr "Режим вывода"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
@@ -3904,12 +3920,12 @@ msgstr ""
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  day of the month: 0"
-msgstr ""
+msgstr "  день месяца: 0"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart
 msgid "Account chart"
-msgstr ""
+msgstr "План счета"
 
 #. module: account
 #: report:account.account.balance.landscape:0
@@ -3926,7 +3942,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr ""
+msgstr "Статистика по счетам"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
@@ -3954,13 +3970,13 @@ msgstr "Шаблон счета"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,balance_end_real:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "Итоговое сальдо"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:0
 #, python-format
 msgid "Not implemented"
-msgstr ""
+msgstr "Не реализовано"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
@@ -3977,7 +3993,7 @@ msgstr ""
 #: code:addons/account/wizard/account_use_model.py:0
 #, python-format
 msgid "Unable to find a valid period !"
-msgstr ""
+msgstr "Не удалось найти действующий период !"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -3987,7 +4003,7 @@ msgstr "Ваучер №"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -3997,7 +4013,7 @@ msgstr ""
 #. module: account
 #: view:account.use.model:0
 msgid "Create Entries From Models"
-msgstr ""
+msgstr "Создать проводки по моделям"
 
 #. module: account
 #: field:account.account.template,reconcile:0
@@ -4023,7 +4039,7 @@ msgstr "Статистика счета аналитики"
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,based_on:0
 msgid "Based On"
-msgstr ""
+msgstr "Основан на"
 
 #. module: account
 #: field:account.tax,price_include:0
@@ -4040,12 +4056,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_model_form
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Recurring Models"
-msgstr ""
+msgstr "Повторяющиеся модели"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "4"
-msgstr ""
+msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
@@ -4114,7 +4130,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Generate Entries"
-msgstr ""
+msgstr "Генерировать проводки"
 
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
@@ -4140,18 +4156,18 @@ msgstr "Клиент"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Подтверждено"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Отмененный счет"
 
 #. module: account
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "You must define an analytic journal of type '%s' !"
-msgstr ""
+msgstr "Вы должны определить журнал аналитики типа '%s' !"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -4189,17 +4205,17 @@ msgstr "Баланс по счету -"
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Invoice "
-msgstr ""
+msgstr "Счет "
 
 #. module: account
 #: field:account.automatic.reconcile,date1:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Дата начала"
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
 msgid "Income Account on Product Template"
-msgstr ""
+msgstr "Счет доходов и расходов из шаблона ТМЦ"
 
 #. module: account
 #: help:res.partner,last_reconciliation_date:0
@@ -4230,12 +4246,12 @@ msgstr "Счета"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "Менеджер продаж"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Выставлен счет"
 
 #. module: account
 #: view:account.use.model:0
@@ -4255,7 +4271,7 @@ msgstr ""
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Add"
-msgstr ""
+msgstr "Добавить"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -4265,7 +4281,7 @@ msgstr "Оставьте пустым для текущей даты"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Bank and Cheques"
-msgstr ""
+msgstr "Банк и чеки"
 
 #. module: account
 #: view:account.period.close:0
@@ -4280,7 +4296,7 @@ msgstr "Для сверки с банком использовать банко
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
 msgid "Draft invoices are validated. "
-msgstr ""
+msgstr "Черновики счетов проверяются. "
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4291,7 +4307,7 @@ msgstr "Вычислить"
 #. module: account
 #: field:account.tax,type_tax_use:0
 msgid "Tax Application"
-msgstr ""
+msgstr "Налоги"
 
 #. module: account
 #: view:account.move:0
@@ -4316,7 +4332,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
 #, python-format
 msgid "Journal Items"
-msgstr ""
+msgstr "Записи журнала"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -4339,7 +4355,7 @@ msgstr ""
 #: code:addons/account/wizard/account_report_common.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Ошибка"
 
 #. module: account
 #: field:account.analytic.Journal.report,date2:0
@@ -4359,7 +4375,7 @@ msgstr "Банковская информация"
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Taxes missing !"
-msgstr ""
+msgstr "Налоги отсутствуют !"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
@@ -4376,12 +4392,12 @@ msgstr ""
 #. module: account
 #: view:account.fiscalyear.close:0
 msgid "Generate Fiscal Year Opening Entries"
-msgstr ""
+msgstr "Генерировать записи открытия финансового года"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
 msgid "Group Invoice Lines"
-msgstr ""
+msgstr "Группировать позиции счета"
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -4403,7 +4419,7 @@ msgstr ""
 #. module: account
 #: view:account.period:0
 msgid "To Close"
-msgstr ""
+msgstr "Закрыть"
 
 #. module: account
 #: field:account.journal,allow_date:0
@@ -4441,7 +4457,7 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "5"
-msgstr ""
+msgstr "5"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -4487,7 +4503,7 @@ msgstr "Тип периода"
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
 msgid "Payments"
-msgstr ""
+msgstr "Платежи"
 
 #. module: account
 #: field:account.subscription.line,move_id:0
@@ -4545,7 +4561,7 @@ msgstr ""
 #: field:report.account.sales,name:0
 #: field:report.account_type.sales,name:0
 msgid "Year"
-msgstr ""
+msgstr "Год"
 
 #. module: account
 #: field:account.bank.statement,starting_details_ids:0
@@ -4577,7 +4593,7 @@ msgstr "месяц"
 #: code:addons/account/account_bank_statement.py:0
 #, python-format
 msgid "Journal Item \"%s\" is not valid"
-msgstr ""
+msgstr "Запись  \"%s\" в журнале не верна"
 
 #. module: account
 #: view:account.payment.term:0
@@ -4605,12 +4621,12 @@ msgstr "Результат сверки"
 #: model:ir.actions.act_window,name:account.action_account_bs_report
 #: model:ir.ui.menu,name:account.menu_account_bs_report
 msgid "Balance Sheet"
-msgstr ""
+msgstr "Балансовая ведомость"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
 msgid "Accounting Reports"
-msgstr ""
+msgstr "Отчеты бухучета"
 
 #. module: account
 #: field:account.move,line_id:0
@@ -4623,7 +4639,7 @@ msgstr "Проводки"
 #. module: account
 #: view:account.entries.report:0
 msgid "This Period"
-msgstr ""
+msgstr "Этот период"
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -4673,7 +4689,7 @@ msgstr "Сумма"
 #: code:addons/account/wizard/account_fiscalyear_close.py:0
 #, python-format
 msgid "End of Fiscal Year Entry"
-msgstr ""
+msgstr "Запись конца финансового года"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_customerinvoice0
@@ -4683,7 +4699,7 @@ msgstr ""
 #: model:process.transition,name:account.process_transition_suppliervalidentries0
 #: model:process.transition,name:account.process_transition_validentries0
 msgid "Validation"
-msgstr ""
+msgstr "Проверка"
 
 #. module: account
 #: help:account.invoice,reconciled:0
@@ -4729,7 +4745,7 @@ msgstr "Имя счета/контрагента"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transaction"
-msgstr ""
+msgstr "Операция"
 
 #. module: account
 #: help:account.tax,base_code_id:0
@@ -4746,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
@@ -4762,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
@@ -4787,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
@@ -4826,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
@@ -4865,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
@@ -4896,7 +4914,7 @@ msgstr "Позиции подписки"
 #. module: account
 #: field:account.entries.report,quantity:0
 msgid "Products Quantity"
-msgstr ""
+msgstr "Количество ТМЦ"
 
 #. module: account
 #: view:account.entries.report:0
@@ -4912,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
@@ -5087,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
@@ -5121,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
@@ -5175,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
@@ -5192,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
@@ -5263,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
@@ -5288,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
@@ -5329,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
@@ -5357,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
@@ -5368,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
@@ -5384,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
@@ -5402,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
@@ -5445,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
@@ -5475,7 +5493,7 @@ msgstr ""
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "is validated."
-msgstr ""
+msgstr "проверено."
 
 #. module: account
 #: view:account.chart.template:0
@@ -5501,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
@@ -5534,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
@@ -5547,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
@@ -5562,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
@@ -5633,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
@@ -5656,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
@@ -5666,7 +5684,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current"
-msgstr ""
+msgstr "Текущий"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5681,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
@@ -5761,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
@@ -5794,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
@@ -5806,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
@@ -5824,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
@@ -5856,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
@@ -5866,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
@@ -5883,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
@@ -5919,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/si.po b/addons/account/i18n/si.po
index f6cdf86b87a..3c6d7857824 100644
--- a/addons/account/i18n/si.po
+++ b/addons/account/i18n/si.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-14 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2652,6 +2657,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po
index 387ded1cbc1..d992bf8a8e0 100644
--- a/addons/account/i18n/sk.po
+++ b/addons/account/i18n/sk.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-14 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2652,6 +2657,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index b1cfade8f82..e86b2377b41 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.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-14 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1017,6 +1017,11 @@ msgstr "Teden v letu"
 msgid "Landscape Mode"
 msgstr "Ležeče"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1942,7 +1947,7 @@ msgstr "Odprte postavke"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2660,6 +2665,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Znesek osnove"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index bd617522d04..d5c899c4355 100644
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.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-14 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1012,6 +1012,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1937,7 +1942,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2660,6 +2665,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Vlera Kodit Bazik"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index cc950ba6a06..631ef29442a 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.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-14 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1021,6 +1021,11 @@ msgstr "Nedelja u godini"
 msgid "Landscape Mode"
 msgstr "Prosireni način"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1948,7 +1953,7 @@ msgstr "Otvori stavke"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2673,6 +2678,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Iznos osnvice"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/sr@latin.po b/addons/account/i18n/sr@latin.po
index e003bee3d82..37b4f580631 100644
--- a/addons/account/i18n/sr@latin.po
+++ b/addons/account/i18n/sr@latin.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-14 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2652,6 +2657,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index c8090dec491..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-13 21:58+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\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-14 05:13+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
@@ -1025,6 +1028,11 @@ msgstr "Veckonummer"
 msgid "Landscape Mode"
 msgstr "Landscape Mode"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1046,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
@@ -1080,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
@@ -1095,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
@@ -1957,7 +1965,7 @@ msgstr "Open Entries"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2685,6 +2693,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Baskodsbelopp"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr "Visa"
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/ta.po b/addons/account/i18n/ta.po
index 2d3391d98ac..2c20567f213 100644
--- a/addons/account/i18n/ta.po
+++ b/addons/account/i18n/ta.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-14 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2652,6 +2657,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/te.po b/addons/account/i18n/te.po
index 1d092c4d53b..6094146f104 100644
--- a/addons/account/i18n/te.po
+++ b/addons/account/i18n/te.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-14 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2652,6 +2657,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po
index 28d5b65b616..e5e8fb70b17 100644
--- a/addons/account/i18n/th.po
+++ b/addons/account/i18n/th.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-14 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2652,6 +2657,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/tlh.po b/addons/account/i18n/tlh.po
index 11798a72560..8b25b709a88 100644
--- a/addons/account/i18n/tlh.po
+++ b/addons/account/i18n/tlh.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-14 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1009,6 +1009,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1934,7 +1939,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2651,6 +2656,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 8ab99f4310b..ef24b51fdb8 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.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-14 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1045,6 +1045,11 @@ msgstr "Yıl:Hafta"
 msgid "Landscape Mode"
 msgstr "Landscape Mode"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1989,7 +1994,7 @@ msgstr "Open Entries"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2728,6 +2733,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Base Code Amount"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/ug.po b/addons/account/i18n/ug.po
index b75c69fe456..356594195d0 100644
--- a/addons/account/i18n/ug.po
+++ b/addons/account/i18n/ug.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-14 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2652,6 +2657,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po
index 06550dc708a..558aac9c18b 100644
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.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-14 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1014,6 +1014,11 @@ msgstr "Тиждень року"
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1939,7 +1944,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2656,6 +2661,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Сума по базовому коду"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index d0bc40926c8..51839faf578 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/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:14+0000\n"
-"PO-Revision-Date: 2010-12-12 05:31+0000\n"
-"Last-Translator: Phong Nguyen <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 02:08+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-14 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1059,6 +1059,11 @@ msgstr "Week of Year"
 msgid "Landscape Mode"
 msgstr "Landscape Mode"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -2009,9 +2014,11 @@ msgstr "Open Entries"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
+"A vendor refund is a credit note from your supplier indicating that he "
+"refunds part or totality of the invoice sent to you."
 
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
@@ -2757,6 +2764,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "Base Code Amount"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
@@ -10131,13 +10143,6 @@ msgstr "You cannot remove an account which has account entries!. "
 #~ msgid "A/c No."
 #~ msgstr "A/c No."
 
-#~ 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 ""
-#~ "A vendor refund is a credit note from your supplier indicating that he "
-#~ "refunds part or totality of the invoice sent to you."
-
 #~ msgid "Select recurring to create a manualy recurring accounting entries"
 #~ msgstr "Select recurring to create a manualy recurring accounting entries"
 
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index beb8405e5ad..27fef8f9840 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.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-14 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1009,6 +1009,11 @@ msgstr "会计年度里的周"
 msgid "Landscape Mode"
 msgstr "横向模式"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1934,7 +1939,7 @@ msgstr "打开凭证"
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2653,6 +2658,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr "基础税事务代码的金额"
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/zh_HK.po b/addons/account/i18n/zh_HK.po
index af723051b80..81cb22db501 100644
--- a/addons/account/i18n/zh_HK.po
+++ b/addons/account/i18n/zh_HK.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-14 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1010,6 +1010,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1935,7 +1940,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2652,6 +2657,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index f6436dffa86..50d5017ed8a 100644
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.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-14 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1009,6 +1009,11 @@ msgstr ""
 msgid "Landscape Mode"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
@@ -1934,7 +1939,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
 msgid ""
-"A supplier refund is a credit note from your supplier indicating that he "
+"A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
 
@@ -2651,6 +2656,11 @@ msgstr ""
 msgid "Base Code Amount"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 1bda9427e75..5f66354c5f6 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 625a91ad289..6c5db1cb61a 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}
@@ -1320,9 +1321,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})
@@ -1352,7 +1353,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
@@ -1361,7 +1362,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
@@ -1379,8 +1380,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]
@@ -1435,8 +1436,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
@@ -1461,7 +1462,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:
@@ -1592,11 +1595,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_entries_report.py b/addons/account/report/account_entries_report.py
index a6936c74210..e80cb290889 100644
--- a/addons/account/report/account_entries_report.py
+++ b/addons/account/report/account_entries_report.py
@@ -94,7 +94,7 @@ class account_entries_report(osv.osv):
         return super(account_entries_report, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order,
             context=context, count=count)
 
-    def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False):
+    def read_group(self, cr, uid, domain, *args, **kwargs):
         todel=[]
         fiscalyear_obj = self.pool.get('account.fiscalyear')
         period_obj = self.pool.get('account.period')
@@ -112,7 +112,7 @@ class account_entries_report(osv.osv):
         for a in [['period_id','in','current_year'], ['period_id','in','current_period']]:
             if a in domain:
                 domain.remove(a)
-        return super(account_entries_report, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context, orderby)
+        return super(account_entries_report, self).read_group(cr, uid, domain, *args, **kwargs)
 
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'account_entries_report')
diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 6e67879d81c..80ccd2aabae 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -131,32 +131,20 @@
   </stylesheet>
   <story>
   <pto>
-  <pto_header>
-    <blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Description</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Taxes</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Quantity</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Unit Price </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Disc.(%)</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Price</para>
-        </td>
-      </tr>
-    </blockTable>
-  </pto_header>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
+    <pto_header><!-- Must be after setLang() -->
+	<blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7">
+	<tr>
+	    <td> <para style="terp_tblheader_Details">Description</para> </td>
+	    <td> <para style="terp_tblheader_Details_Centre">Taxes</para> </td>
+	    <td> <para style="terp_tblheader_Details_Centre">Quantity</para> </td>
+	    <td> <para style="terp_tblheader_Details_Right">Unit Price </para> </td>
+	    <td> <para style="terp_tblheader_Details_Right">Disc.(%)</para> </td>
+	    <td> <para style="terp_tblheader_Details_Right">Price</para> </td>
+	</tr>
+	</blockTable>
+    </pto_header>
     <blockTable colWidths="297.0,233.0" style="Table_Partner_Address">
       <tr>
         <td>
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/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index e2e4db0933e..c874cc3e5d2 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -4,6 +4,7 @@
 "access_account_payment_term_line","account.payment.term.line","model_account_payment_term_line","account.group_account_user",1,0,0,0
 "access_account_account_type","account.account.type","model_account_account_type","account.group_account_user",1,0,0,0
 "access_account_tax","account.tax","model_account_tax","account.group_account_user",1,0,0,0
+"access_account_tax_internal_user","account.tax internal user","model_account_tax","base.group_user",1,0,0,0
 "access_account_account","account.account","model_account_account","account.group_account_user",1,0,0,0
 "access_account_account_user","account.account user","model_account_account","base.group_user",1,0,0,0
 "access_account_account_partner_manager","account.account partner manager","model_account_account","base.group_partner_manager",1,0,0,0
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 5f4616075fc..2c10f83eee4 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -49,7 +49,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
         """
@@ -150,8 +150,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_accountant/i18n/da.po b/addons/account_accountant/i18n/da.po
index bb2bee3c032..d99b93457ba 100644
--- a/addons/account_accountant/i18n/da.po
+++ b/addons/account_accountant/i18n/da.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/de.po b/addons/account_accountant/i18n/de.po
index ed64aa986ec..3ca52034279 100644
--- a/addons/account_accountant/i18n/de.po
+++ b/addons/account_accountant/i18n/de.po
@@ -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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/el.po b/addons/account_accountant/i18n/el.po
index 4c1e774c1ff..121583a8ac7 100644
--- a/addons/account_accountant/i18n/el.po
+++ b/addons/account_accountant/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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/es.po b/addons/account_accountant/i18n/es.po
index 49fab4c9321..5b0da6cbc9b 100644
--- a/addons/account_accountant/i18n/es.po
+++ b/addons/account_accountant/i18n/es.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/es_EC.po b/addons/account_accountant/i18n/es_EC.po
index c9a491185b9..4a0dfcc7679 100644
--- a/addons/account_accountant/i18n/es_EC.po
+++ b/addons/account_accountant/i18n/es_EC.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/fr.po b/addons/account_accountant/i18n/fr.po
index 1844563b827..3acf527c848 100644
--- a/addons/account_accountant/i18n/fr.po
+++ b/addons/account_accountant/i18n/fr.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/it.po b/addons/account_accountant/i18n/it.po
index 1e51ea60187..f5859cc021e 100644
--- a/addons/account_accountant/i18n/it.po
+++ b/addons/account_accountant/i18n/it.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/nl.po b/addons/account_accountant/i18n/nl.po
index da638c4dcb0..d76d38844e7 100644
--- a/addons/account_accountant/i18n/nl.po
+++ b/addons/account_accountant/i18n/nl.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/pl.po b/addons/account_accountant/i18n/pl.po
index 52f0ec35e7f..8d81553d3a8 100644
--- a/addons/account_accountant/i18n/pl.po
+++ b/addons/account_accountant/i18n/pl.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/pt.po b/addons/account_accountant/i18n/pt.po
index f78d325f82a..39f77f28458 100644
--- a/addons/account_accountant/i18n/pt.po
+++ b/addons/account_accountant/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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/pt_BR.po b/addons/account_accountant/i18n/pt_BR.po
index d3f5279d19c..e9b300f321f 100644
--- a/addons/account_accountant/i18n/pt_BR.po
+++ b/addons/account_accountant/i18n/pt_BR.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/ro.po b/addons/account_accountant/i18n/ro.po
index 8f19daa0074..f235b37e680 100644
--- a/addons/account_accountant/i18n/ro.po
+++ b/addons/account_accountant/i18n/ro.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/ru.po b/addons/account_accountant/i18n/ru.po
index 12f7ffd39cf..cae42c73549 100644
--- a/addons/account_accountant/i18n/ru.po
+++ b/addons/account_accountant/i18n/ru.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/sk.po b/addons/account_accountant/i18n/sk.po
index 98cb2a5cbf3..8c7b19cfa8b 100644
--- a/addons/account_accountant/i18n/sk.po
+++ b/addons/account_accountant/i18n/sk.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/sl.po b/addons/account_accountant/i18n/sl.po
index 443e13b47ff..f5d142897b9 100644
--- a/addons/account_accountant/i18n/sl.po
+++ b/addons/account_accountant/i18n/sl.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/sr.po b/addons/account_accountant/i18n/sr.po
index 8315519ff39..52516e3a696 100644
--- a/addons/account_accountant/i18n/sr.po
+++ b/addons/account_accountant/i18n/sr.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/sr@latin.po b/addons/account_accountant/i18n/sr@latin.po
index fa729b6c9ca..3ab92ff66f6 100644
--- a/addons/account_accountant/i18n/sr@latin.po
+++ b/addons/account_accountant/i18n/sr@latin.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/sv.po b/addons/account_accountant/i18n/sv.po
index 1caccf9fd95..e9fe9d153d2 100644
--- a/addons/account_accountant/i18n/sv.po
+++ b/addons/account_accountant/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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/tr.po b/addons/account_accountant/i18n/tr.po
index 8c05c77e057..ccd98e8dcb9 100644
--- a/addons/account_accountant/i18n/tr.po
+++ b/addons/account_accountant/i18n/tr.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/uk.po b/addons/account_accountant/i18n/uk.po
index ed03498f037..eff9da02f19 100644
--- a/addons/account_accountant/i18n/uk.po
+++ b/addons/account_accountant/i18n/uk.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/vi.po b/addons/account_accountant/i18n/vi.po
index ab93a7beb32..fe5da363c91 100644
--- a/addons/account_accountant/i18n/vi.po
+++ b/addons/account_accountant/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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
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_default/i18n/ar.po b/addons/account_analytic_default/i18n/ar.po
index a148aa8edb1..ace243c4b88 100644
--- a/addons/account_analytic_default/i18n/ar.po
+++ b/addons/account_analytic_default/i18n/ar.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-02 20:39+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,17 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "حساب التحليل الإفتراضي"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "اسم الكائن يجب أن يبدأ ب _x ولا يحتوي على رموز خاصة"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -67,11 +56,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "إسم الموديل غير صالح."
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -133,11 +117,6 @@ msgstr "المدخلات"
 msgid "End Date"
 msgstr "تاريخ الإنتهاء"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "هناك خطأ في XML لم يتم العرض"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -197,8 +176,18 @@ msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "اسم الكائن يجب أن يبدأ ب _x ولا يحتوي على رموز خاصة"
+
 #~ msgid "Seq"
 #~ msgstr "مايلي"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "هناك خطأ في XML لم يتم العرض"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "إسم الموديل غير صالح."
+
 #~ msgid "Analytic Distributions"
 #~ msgstr "تحليل التوزيعات"
diff --git a/addons/account_analytic_default/i18n/bg.po b/addons/account_analytic_default/i18n/bg.po
index 77d3a090c06..f09fc5508e0 100644
--- a/addons/account_analytic_default/i18n/bg.po
+++ b/addons/account_analytic_default/i18n/bg.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-02 20:41+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,19 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Аналитична сметка по подразбиране"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-"символи!"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -69,11 +56,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Невалидно име на модел при задаването на действие."
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -135,11 +117,6 @@ msgstr "Записи"
 msgid "End Date"
 msgstr "Крайна дата"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -199,8 +176,20 @@ msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Невалиден XML за преглед на архитектурата"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
+#~ "символи!"
+
 #~ msgid "Seq"
 #~ msgstr "Поредност"
 
 #~ msgid "Analytic Distributions"
 #~ msgstr "Разпределение на аналитична сметка"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Невалидно име на модел при задаването на действие."
diff --git a/addons/account_analytic_default/i18n/bs.po b/addons/account_analytic_default/i18n/bs.po
index 79d6f94f890..73d06644696 100644
--- a/addons/account_analytic_default/i18n/bs.po
+++ b/addons/account_analytic_default/i18n/bs.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-02 20:41+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,18 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Uobičajene postavke analize računa"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -68,11 +56,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Neispravan naziv modela u definiciji zadatka."
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -134,11 +117,6 @@ msgstr "Unosi"
 msgid "End Date"
 msgstr "Završni datum"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -198,8 +176,19 @@ msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
+
 #~ msgid "Seq"
 #~ msgstr "Redoslijed"
 
 #~ msgid "Analytic Distributions"
 #~ msgstr "Raspodjele analitike"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neispravan naziv modela u definiciji zadatka."
diff --git a/addons/account_analytic_default/i18n/ca.po b/addons/account_analytic_default/i18n/ca.po
index 2c33e2b2b80..7e2970a8c81 100644
--- a/addons/account_analytic_default/i18n/ca.po
+++ b/addons/account_analytic_default/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-11-17 09:38+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -22,19 +22,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Comptes analítics per defecte"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-"especial!"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -70,11 +57,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de model no vàlid en la definició de l'acció."
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -136,11 +118,6 @@ msgstr "Assentaments"
 msgid "End Date"
 msgstr "Data final"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -200,8 +177,20 @@ msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invàlid per a la definició de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+#~ "especial!"
+
 #~ msgid "Seq"
 #~ msgstr "Seqüència"
 
 #~ msgid "Analytic Distributions"
 #~ msgstr "Distribucions analítiques"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom de model no vàlid en la definició de l'acció."
diff --git a/addons/account_analytic_default/i18n/cs.po b/addons/account_analytic_default/i18n/cs.po
index 02dff712a9a..b2dacae3ade 100644
--- a/addons/account_analytic_default/i18n/cs.po
+++ b/addons/account_analytic_default/i18n/cs.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-02 20:42+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,18 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Výchozí analytický účet"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -68,11 +56,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Špatný název modelu v definici akce"
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -134,11 +117,6 @@ msgstr "Položky"
 msgid "End Date"
 msgstr "Koncové datum"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalidní XML pro zobrazení architektury!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -203,3 +181,14 @@ msgstr ""
 
 #~ msgid "Analytic Distributions"
 #~ msgstr "Analytická distribuce"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalidní XML pro zobrazení architektury!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Špatný název modelu v definici akce"
diff --git a/addons/account_analytic_default/i18n/de.po b/addons/account_analytic_default/i18n/de.po
index 96b21db4275..bb55c02edaa 100644
--- a/addons/account_analytic_default/i18n/de.po
+++ b/addons/account_analytic_default/i18n/de.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-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/el.po b/addons/account_analytic_default/i18n/el.po
index 2b5e6e74085..33f088ca89c 100644
--- a/addons/account_analytic_default/i18n/el.po
+++ b/addons/account_analytic_default/i18n/el.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-14 08:17+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-11-15 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -22,19 +22,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Προκαθορισμένος Λογαριασμός Αναλυτικής"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Το όνομα του αντικειμένου θα πρέπει να ξεκινάει με x_ και να μην περιέχει "
-"ειδικούς χαρακτήρες!"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Λάθος δεν μπορείς να δημιουργήσεις κενό Μενού."
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -70,11 +57,6 @@ msgstr "Ομαδοποίηση Κατά..."
 msgid "Default end date for this Analytical Account"
 msgstr "Προκαθορισμένη Ημερομηνία Λήξης γι' αυτόν τον Λογαριασμό Αναλυτικής"
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -136,11 +118,6 @@ msgstr "Εγγραφές"
 msgid "End Date"
 msgstr "Ημερομηνία Λήξης"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "'Ακυρο XML για αρχιτεκτονική όψης!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -200,8 +177,23 @@ msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Το όνομα του αντικειμένου θα πρέπει να ξεκινάει με x_ και να μην περιέχει "
+#~ "ειδικούς χαρακτήρες!"
+
 #~ msgid "Seq"
 #~ msgstr "Αλληλ."
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "'Ακυρο XML για αρχιτεκτονική όψης!"
+
 #~ msgid "Analytic Distributions"
 #~ msgstr "Αναλυτικές Διανομές"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Λάθος δεν μπορείς να δημιουργήσεις κενό Μενού."
diff --git a/addons/account_analytic_default/i18n/es.po b/addons/account_analytic_default/i18n/es.po
index 2fda631b916..ccfab890fb3 100644
--- a/addons/account_analytic_default/i18n/es.po
+++ b/addons/account_analytic_default/i18n/es.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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-19 09:25+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\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-11-20 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,19 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Cuenta analítica por defecto"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -73,11 +60,6 @@ msgstr "Agrupar por..."
 msgid "Default end date for this Analytical Account"
 msgstr "Fecha final por defecto para esta cuenta analítica."
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -105,11 +87,6 @@ msgstr ""
 msgid "Sale Order Line"
 msgstr "Línea pedido de venta"
 
-#. module: account_analytic_default
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytical Account"
@@ -148,11 +125,6 @@ msgstr "Asientos"
 msgid "End Date"
 msgstr "Fecha final"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -185,11 +157,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: account_analytic_default
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
 msgid "Invoice Line"
@@ -225,13 +192,32 @@ msgstr ""
 "Indica el orden de la secuencia cuando se muestra una lista de distribución "
 "analítica."
 
-#. module: account_analytic_default
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
 
 #~ msgid "Seq"
 #~ msgstr "Secuencia"
 
 #~ msgid "Analytic Distributions"
 #~ msgstr "Distribuciones analíticas"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/account_analytic_default/i18n/es_AR.po b/addons/account_analytic_default/i18n/es_AR.po
index 1fbec8f72d9..f840799d0fa 100644
--- a/addons/account_analytic_default/i18n/es_AR.po
+++ b/addons/account_analytic_default/i18n/es_AR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-09-14 15:05+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,19 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Cuentas analíticas predeterminadas"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
-"especial!"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -69,11 +56,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -135,11 +117,6 @@ msgstr "Asientos"
 msgid "End Date"
 msgstr "Fecha de fin"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -199,8 +176,17 @@ msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
+#~ "especial!"
+
 #~ msgid "Seq"
 #~ msgstr "Secuencia"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para la definición de la vista!"
+
 #~ msgid "Analytic Distributions"
 #~ msgstr "Distribuciones analíticas"
diff --git a/addons/account_analytic_default/i18n/es_EC.po b/addons/account_analytic_default/i18n/es_EC.po
index a117aebaeb0..2291a20ae39 100644
--- a/addons/account_analytic_default/i18n/es_EC.po
+++ b/addons/account_analytic_default/i18n/es_EC.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-09 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/et.po b/addons/account_analytic_default/i18n/et.po
index 4bedce6ee1c..c1429a075ff 100644
--- a/addons/account_analytic_default/i18n/et.po
+++ b/addons/account_analytic_default/i18n/et.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-10-27 08:04+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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,18 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Vaikimisi analüütiline konto"
 
-#. module: account_analytic_default
-#: 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: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Viga! Te ei saa luua rekursiivset menüüd."
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -68,11 +56,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -134,11 +117,6 @@ msgstr "Kirjed"
 msgid "End Date"
 msgstr "Lõppkuupäev"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -199,8 +177,22 @@ msgid ""
 msgstr ""
 "Annab sorteeritud järjestuse, kui näidatakse nimekirja analüütilist jaotust"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Vigane XML vaate arhitektuurile!"
+
+#~ 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 "Seq"
 #~ msgstr "Jrk"
 
 #~ msgid "Analytic Distributions"
 #~ msgstr "Analüütilised jaotused"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Viga! Te ei saa luua rekursiivset menüüd."
diff --git a/addons/account_analytic_default/i18n/fi.po b/addons/account_analytic_default/i18n/fi.po
index 8e41b82cc36..f00f4039390 100644
--- a/addons/account_analytic_default/i18n/fi.po
+++ b/addons/account_analytic_default/i18n/fi.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-02 20:43+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: Finnish <fi@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:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -22,17 +22,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Tilin analyyttiset oletukset"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -68,11 +57,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -134,11 +118,6 @@ msgstr "Kirjaus"
 msgid "End Date"
 msgstr "Lopetuspäivämäärä"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -201,5 +180,15 @@ msgstr ""
 #~ msgid "Analytic Distributions"
 #~ msgstr "Analyyttiset levitykset"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
+
 #~ msgid "Seq"
 #~ msgstr "Sarja"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
diff --git a/addons/account_analytic_default/i18n/fr.po b/addons/account_analytic_default/i18n/fr.po
index 70359face92..750feb7739a 100644
--- a/addons/account_analytic_default/i18n/fr.po
+++ b/addons/account_analytic_default/i18n/fr.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-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/gl.po b/addons/account_analytic_default/i18n/gl.po
index 4a3a7c50fac..4a279d6c156 100644
--- a/addons/account_analytic_default/i18n/gl.po
+++ b/addons/account_analytic_default/i18n/gl.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: account-analytic-default-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-11-17 09:38+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -23,19 +23,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Contas analíticas predefinidas"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡O nome do obxecto debe comezar con x_ y e non conter ningún carácter "
-"especial!"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -71,11 +58,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "El nome del modelu nun ye válidu pa la definición de l'aición"
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -137,11 +119,6 @@ msgstr "Asentos"
 msgid "End Date"
 msgstr "Data final"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML non válido para a definición da vista!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -201,8 +178,20 @@ msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML non válido para a definición da vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡O nome do obxecto debe comezar con x_ y e non conter ningún carácter "
+#~ "especial!"
+
 #~ msgid "Seq"
 #~ msgstr "Secuencia"
 
 #~ msgid "Analytic Distributions"
 #~ msgstr "Distribucións analíticas"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "El nome del modelu nun ye válidu pa la definición de l'aición"
diff --git a/addons/account_analytic_default/i18n/hr.po b/addons/account_analytic_default/i18n/hr.po
index 02548a290e8..10902076802 100644
--- a/addons/account_analytic_default/i18n/hr.po
+++ b/addons/account_analytic_default/i18n/hr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-02 20:44+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,18 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Uobičajene postavke analize računa"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta mora početi sa x_ i ne smije sadržavati specijalne znakove !"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -68,11 +56,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nevažeće ime modela u definiciji akcije."
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -134,11 +117,6 @@ msgstr "Stavke"
 msgid "End Date"
 msgstr "Završni datum"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neispravan XML za arhitekturu prikaza!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -198,8 +176,19 @@ msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neispravan XML za arhitekturu prikaza!"
+
 #~ msgid "Seq"
 #~ msgstr "Redoslijed"
 
 #~ msgid "Analytic Distributions"
 #~ msgstr "Raspodjele analitike"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta mora početi sa x_ i ne smije sadržavati specijalne znakove !"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nevažeće ime modela u definiciji akcije."
diff --git a/addons/account_analytic_default/i18n/hu.po b/addons/account_analytic_default/i18n/hu.po
index c4f5f46b8ba..7a570c8f4aa 100644
--- a/addons/account_analytic_default/i18n/hu.po
+++ b/addons/account_analytic_default/i18n/hu.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-02-03 06:23+0000\n"
 "Last-Translator: <>\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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,17 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -67,11 +56,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -133,11 +117,6 @@ msgstr ""
 msgid "End Date"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
diff --git a/addons/account_analytic_default/i18n/id.po b/addons/account_analytic_default/i18n/id.po
index d9cfd329f2e..45ef70c4cac 100644
--- a/addons/account_analytic_default/i18n/id.po
+++ b/addons/account_analytic_default/i18n/id.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-11-09 16:11+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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,17 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -67,11 +56,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -133,11 +117,6 @@ msgstr "Transaksi"
 msgid "End Date"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
diff --git a/addons/account_analytic_default/i18n/it.po b/addons/account_analytic_default/i18n/it.po
index dba852635a8..bd0d87e86e3 100644
--- a/addons/account_analytic_default/i18n/it.po
+++ b/addons/account_analytic_default/i18n/it.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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-22 07:17+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-11-23 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,19 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Valori predefiniti Conti Analitici"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -69,11 +56,6 @@ msgstr "Raggruppa per..."
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome del modulo non valido nella definizione dell'azione."
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -97,11 +79,6 @@ msgstr ""
 msgid "Sale Order Line"
 msgstr "Riga Ordine di Vendita"
 
-#. module: account_analytic_default
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "L'ID certificato del modulo deve essere unico!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytical Account"
@@ -140,11 +117,6 @@ msgstr "Registrazioni"
 msgid "End Date"
 msgstr "Data finale"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -171,11 +143,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Sequenza"
 
-#. module: account_analytic_default
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere unico!"
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
 msgid "Invoice Line"
@@ -209,13 +176,32 @@ msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
 
-#. module: account_analytic_default
-#: 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 "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per Visualizzazione Architettura!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
 
 #~ msgid "Seq"
 #~ msgstr "Seq"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome del modulo non valido nella definizione dell'azione."
+
 #~ msgid "Analytic Distributions"
 #~ msgstr "Distribuzione conto analitico"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "L'ID certificato 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!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Il nome del modulo deve essere unico!"
diff --git a/addons/account_analytic_default/i18n/ko.po b/addons/account_analytic_default/i18n/ko.po
index 86582e6914c..7d95f98d51a 100644
--- a/addons/account_analytic_default/i18n/ko.po
+++ b/addons/account_analytic_default/i18n/ko.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-03 15:42+0000\n"
 "PO-Revision-Date: 2009-09-08 12:59+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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -22,17 +22,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "계정 분석 디폴트"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자가 포함되면 안됩니다."
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -68,11 +57,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -134,11 +118,6 @@ msgstr "엔트리"
 msgid "End Date"
 msgstr "마감 날짜"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -203,3 +182,10 @@ msgstr ""
 
 #~ msgid "Analytic Distributions"
 #~ 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 !"
diff --git a/addons/account_analytic_default/i18n/lt.po b/addons/account_analytic_default/i18n/lt.po
index 3a1a5990207..3d3f4f03bc1 100644
--- a/addons/account_analytic_default/i18n/lt.po
+++ b/addons/account_analytic_default/i18n/lt.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-09-09 07:15+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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,18 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objekto pavadinimas turi prasidėti x_ ir neturėti jokių specialių simbolių!"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -68,11 +56,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -134,11 +117,6 @@ msgstr "Įrašai"
 msgid "End Date"
 msgstr "Pabaigos data"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Netinkamas XML peržiūros architektūrai!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -200,3 +178,11 @@ msgstr ""
 
 #~ msgid "Seq"
 #~ msgstr "Seka"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Netinkamas XML peržiūros architektūrai!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objekto pavadinimas turi prasidėti x_ ir neturėti jokių specialių simbolių!"
diff --git a/addons/account_analytic_default/i18n/lv.po b/addons/account_analytic_default/i18n/lv.po
index f301160fe86..9837d9d5b2b 100644
--- a/addons/account_analytic_default/i18n/lv.po
+++ b/addons/account_analytic_default/i18n/lv.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-03 15:42+0000\n"
 "PO-Revision-Date: 2009-09-08 15:46+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Latvian <lv@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:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -22,17 +22,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Analītiskais Konts pēc Noklusējuma"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -68,11 +57,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -134,11 +118,6 @@ msgstr "Ieraksti"
 msgid "End Date"
 msgstr "Beigu Datums"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
diff --git a/addons/account_analytic_default/i18n/mn.po b/addons/account_analytic_default/i18n/mn.po
index 624e2c4f589..eae1da106a2 100644
--- a/addons/account_analytic_default/i18n/mn.po
+++ b/addons/account_analytic_default/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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-12 06:37+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:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -22,19 +22,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Дансны аналитик үндсэн утга"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-"болохгүй!"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -70,11 +57,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр заасан байна."
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -136,11 +118,6 @@ msgstr "Бичлэгүүд"
 msgid "End Date"
 msgstr "Дуусах огноо"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Дэлгэцийн XML алдаатай!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -200,8 +177,20 @@ msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+#~ "болохгүй!"
+
 #~ msgid "Seq"
 #~ msgstr "Д/д"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Дэлгэцийн XML алдаатай!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр заасан байна."
+
 #~ msgid "Analytic Distributions"
 #~ msgstr "Аналитик тархалт"
diff --git a/addons/account_analytic_default/i18n/nb.po b/addons/account_analytic_default/i18n/nb.po
index 36ad36c9edb..67633786d54 100644
--- a/addons/account_analytic_default/i18n/nb.po
+++ b/addons/account_analytic_default/i18n/nb.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-16 09:47+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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -22,17 +22,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Konto Analytisk Forhåndsvalg"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "Objektets navn må starte med x_ og ikke inneholde spesialkarakterer!"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -68,11 +57,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ugyldig modulnavn i handlingsdefinisjonen."
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -134,11 +118,6 @@ msgstr "Adganger"
 msgid "End Date"
 msgstr "Sluttdato"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ugyldig XML for visningsarkitektur!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -198,5 +177,15 @@ msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ugyldig modulnavn i handlingsdefinisjonen."
+
 #~ msgid "Analytic Distributions"
 #~ msgstr "Analytisk Fordeling"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "Objektets navn må starte med x_ og ikke inneholde spesialkarakterer!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ugyldig XML for visningsarkitektur!"
diff --git a/addons/account_analytic_default/i18n/nl.po b/addons/account_analytic_default/i18n/nl.po
index f8c9346564c..033e60eb2be 100644
--- a/addons/account_analytic_default/i18n/nl.po
+++ b/addons/account_analytic_default/i18n/nl.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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-27 01:56+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-11-28 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,18 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Standaard kostenplaats"
 
-#. module: account_analytic_default
-#: 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: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fout ! U kunt geen recursief menu maken."
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -71,11 +59,6 @@ msgstr "Groepeer op.."
 msgid "Default end date for this Analytical Account"
 msgstr "Standaard einddatum voor deze kostenplaats"
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de actie-definitie."
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -102,11 +85,6 @@ msgstr ""
 msgid "Sale Order Line"
 msgstr "Verkooporderregel"
 
-#. module: account_analytic_default
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytical Account"
@@ -145,11 +123,6 @@ msgstr "Boekingen"
 msgid "End Date"
 msgstr "Einddatum"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML, kan overzicht niet weergeven!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -180,11 +153,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Volgorde"
 
-#. module: account_analytic_default
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "De modulenaam moet uniek zijn !"
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
 msgid "Invoice Line"
@@ -218,13 +186,31 @@ msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr "Bepaalt de volgorde bij het weergeven van de kostenverdeling"
 
-#. module: account_analytic_default
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
+#~ 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 "Seq"
 #~ msgstr "Volgorde"
 
 #~ msgid "Analytic Distributions"
 #~ msgstr "Analytische verdelingen"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ongeldige modelnaam in de actie-definitie."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fout ! U kunt geen recursief menu maken."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/account_analytic_default/i18n/nl_BE.po b/addons/account_analytic_default/i18n/nl_BE.po
index 2da7c1cb45f..a02a544cfac 100644
--- a/addons/account_analytic_default/i18n/nl_BE.po
+++ b/addons/account_analytic_default/i18n/nl_BE.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-04-24 15:45+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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,18 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr ""
 
-#. module: account_analytic_default
-#: 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 karakters bevatten !"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -68,11 +56,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -134,11 +117,6 @@ msgstr ""
 msgid "End Date"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -197,3 +175,8 @@ msgstr ""
 msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
+
+#~ 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 karakters bevatten !"
diff --git a/addons/account_analytic_default/i18n/oc.po b/addons/account_analytic_default/i18n/oc.po
index 31fbf4ff0c2..7ed0016121b 100644
--- a/addons/account_analytic_default/i18n/oc.po
+++ b/addons/account_analytic_default/i18n/oc.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-02 20:46+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@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:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -22,19 +22,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Compte Analitic per Defaut"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
-"especials !"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -70,11 +57,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom del Modèl invalid per la definicion de l'accion."
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -136,11 +118,6 @@ msgstr "Escrituras"
 msgid "End Date"
 msgstr "Data de fin"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invalid per l'arquitectura de la vista"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -200,8 +177,20 @@ msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+#~ "especials !"
+
 #~ msgid "Seq"
 #~ msgstr "Seq"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invalid per l'arquitectura de la vista"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
 #~ msgid "Analytic Distributions"
 #~ msgstr "Distribucions Analiticas"
diff --git a/addons/account_analytic_default/i18n/pl.po b/addons/account_analytic_default/i18n/pl.po
index 355ab6bc3c9..ca59bf18244 100644
--- a/addons/account_analytic_default/i18n/pl.po
+++ b/addons/account_analytic_default/i18n/pl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-02-20 15:28+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,19 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Domyślne ustawienia konta analitycznego"
 
-#. module: account_analytic_default
-#: 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: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -69,11 +56,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -135,11 +117,6 @@ msgstr "Zapisy"
 msgid "End Date"
 msgstr "Data końcowa"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -199,5 +176,17 @@ msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#~ 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 "Seq"
 #~ msgstr "Num."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
diff --git a/addons/account_analytic_default/i18n/pt.po b/addons/account_analytic_default/i18n/pt.po
index d856abe0e84..c861be43fc0 100644
--- a/addons/account_analytic_default/i18n/pt.po
+++ b/addons/account_analytic_default/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-04 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/pt_BR.po b/addons/account_analytic_default/i18n/pt_BR.po
index 0b26833f0a3..d66a4678111 100644
--- a/addons/account_analytic_default/i18n/pt_BR.po
+++ b/addons/account_analytic_default/i18n/pt_BR.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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-27 07:53+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-11-28 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,18 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Conta Analítica Padrão"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objeto deve começar com x_ e não deve conter caracteres especiais!"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Erro ! Você não pode criar Menu recursivo."
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -72,11 +60,6 @@ msgstr "Agrupado Por..."
 msgid "Default end date for this Analytical Account"
 msgstr "Data Final Padrão para esta Conta Analítica"
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da ação."
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -104,11 +87,6 @@ msgstr ""
 msgid "Sale Order Line"
 msgstr "Itens de Pedidos"
 
-#. module: account_analytic_default
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "O ID de certificado do módulo precisa ser único !"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytical Account"
@@ -147,11 +125,6 @@ msgstr "Lançamentos"
 msgid "End Date"
 msgstr "Término"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitetura de exibição"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -183,11 +156,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Sequência"
 
-#. module: account_analytic_default
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo precisa ser único !"
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
 msgid "Invoice Line"
@@ -222,13 +190,31 @@ msgid ""
 msgstr ""
 "Fornece a ordem sequencial ao exibir uma lista de distribuição analítica."
 
-#. module: account_analytic_default
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
 #~ msgid "Analytic Distributions"
 #~ msgstr "Distribuição analítica"
 
 #~ msgid "Seq"
 #~ msgstr "Seq"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto deve começar com x_ e não deve conter caracteres especiais!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para a arquitetura de exibição"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de modelo inválido na definição da ação."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Erro ! Você não pode criar Menu recursivo."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID de certificado do módulo precisa ser único !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "O nome do módulo precisa ser único !"
diff --git a/addons/account_analytic_default/i18n/ro.po b/addons/account_analytic_default/i18n/ro.po
index 78058f2e9e8..a834d2aedfd 100644
--- a/addons/account_analytic_default/i18n/ro.po
+++ b/addons/account_analytic_default/i18n/ro.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-02 20:47+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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,19 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Cont analitic implicit"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Numele obiectului trebuie să înceapă cu x_ și nu trebuie să conțină nici un "
-"caracter special !"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -69,11 +56,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nume invalid de model în definirea acţiunii"
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -135,11 +117,6 @@ msgstr "Intrări"
 msgid "End Date"
 msgstr "Dată de sfârșit"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invalid pentru arhitectura machetei de afișare !"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -204,3 +181,15 @@ msgstr ""
 
 #~ msgid "Analytic Distributions"
 #~ msgstr "Distribuţii analitice"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Numele obiectului trebuie să înceapă cu x_ și nu trebuie să conțină nici un "
+#~ "caracter special !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invalid pentru arhitectura machetei de afișare !"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nume invalid de model în definirea acţiunii"
diff --git a/addons/account_analytic_default/i18n/ru.po b/addons/account_analytic_default/i18n/ru.po
index dbbf9f0c4fa..855ff285760 100644
--- a/addons/account_analytic_default/i18n/ru.po
+++ b/addons/account_analytic_default/i18n/ru.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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-29 07:56+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-11-30 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,19 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Счет аналитики по умолчанию"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Имя Объекта должно начинаться с x_ и не должно содержать специальных "
-"символов!"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -69,11 +56,6 @@ msgstr "Объединять по..."
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия"
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -97,11 +79,6 @@ msgstr ""
 msgid "Sale Order Line"
 msgstr "Позиция заказа на продажу"
 
-#. module: account_analytic_default
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytical Account"
@@ -140,11 +117,6 @@ msgstr "Проводки"
 msgid "End Date"
 msgstr "Дата окончания"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Некорректный формат XML для структуры вида!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -171,11 +143,6 @@ msgstr ""
 msgid "Sequence"
 msgstr "Последовательность"
 
-#. module: account_analytic_default
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Название модуля должно быть уникальным !"
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
 msgid "Invoice Line"
@@ -209,13 +176,32 @@ msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
 
-#. module: account_analytic_default
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Размер поля никогда не может быть меньше 1 !"
-
 #~ msgid "Seq"
 #~ msgstr "Последовательность"
 
 #~ msgid "Analytic Distributions"
 #~ 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 "Error ! You can not create recursive Menu."
+#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Размер поля никогда не может быть меньше 1 !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Название модуля должно быть уникальным !"
diff --git a/addons/account_analytic_default/i18n/sk.po b/addons/account_analytic_default/i18n/sk.po
index 25c48ec919e..1889929cf85 100644
--- a/addons/account_analytic_default/i18n/sk.po
+++ b/addons/account_analytic_default/i18n/sk.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-09-29 10:18+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@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:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -22,18 +22,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Predvolený analytický účet"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Názov objektu musí začínať x_ a nesmie obsahovať žiadne špeciálne znaky!"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -69,11 +57,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Neplatný názov modelu v definícii akcie."
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -135,11 +118,6 @@ msgstr "Položky"
 msgid "End Date"
 msgstr "Dátum ukončenia"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neplatné XML pre zobrazenie architektúry!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -199,8 +177,19 @@ msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Názov objektu musí začínať x_ a nesmie obsahovať žiadne špeciálne znaky!"
+
 #~ msgid "Seq"
 #~ msgstr "Por."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neplatný názov modelu v definícii akcie."
+
 #~ msgid "Analytic Distributions"
 #~ msgstr "Analytické distribúcie"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neplatné XML pre zobrazenie architektúry!"
diff --git a/addons/account_analytic_default/i18n/sl.po b/addons/account_analytic_default/i18n/sl.po
index 9c878afe6b1..bbaf983162a 100644
--- a/addons/account_analytic_default/i18n/sl.po
+++ b/addons/account_analytic_default/i18n/sl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-11-17 09:37+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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,18 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Privzete vrednosti analitike konta"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -68,11 +56,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Napačno ime modela v definiciji dejanja."
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -134,11 +117,6 @@ msgstr "Vknjižbe"
 msgid "End Date"
 msgstr "Končni datum"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -198,8 +176,19 @@ msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
+
 #~ msgid "Seq"
 #~ msgstr "Zap."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Napačno ime modela v definiciji dejanja."
+
 #~ msgid "Analytic Distributions"
 #~ msgstr "porazdelitev analitike"
diff --git a/addons/account_analytic_default/i18n/sq.po b/addons/account_analytic_default/i18n/sq.po
index dac257d057b..30c51dcb967 100644
--- a/addons/account_analytic_default/i18n/sq.po
+++ b/addons/account_analytic_default/i18n/sq.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-02 14:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -22,17 +22,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -68,11 +57,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -134,11 +118,6 @@ msgstr ""
 msgid "End Date"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
diff --git a/addons/account_analytic_default/i18n/sr.po b/addons/account_analytic_default/i18n/sr.po
index 0e3c5460991..90d1553b2b2 100644
--- a/addons/account_analytic_default/i18n/sr.po
+++ b/addons/account_analytic_default/i18n/sr.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-10-29 09:33+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -22,18 +22,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Uobičajene postavke analize računa"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -73,11 +61,6 @@ msgstr "Grupirano po"
 msgid "Default end date for this Analytical Account"
 msgstr "podrzaumevani Krajnji datum za ovaj Analiticki Konto"
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Pogrešno ime modela u definiciji akcije."
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -142,11 +125,6 @@ msgstr "Stavke"
 msgid "End Date"
 msgstr "Datum završetka"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za pregled arhitekture"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -212,8 +190,22 @@ msgid ""
 msgstr ""
 "Daje redosled sekvence pri prikazivanju liste analiticke distribucije"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !"
+
 #~ msgid "Seq"
 #~ msgstr "Red"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nevažeći XML za pregled arhitekture"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Pogrešno ime modela u definiciji akcije."
+
 #~ msgid "Analytic Distributions"
 #~ msgstr "Distribucije analitike"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
diff --git a/addons/account_analytic_default/i18n/sr@latin.po b/addons/account_analytic_default/i18n/sr@latin.po
index 740cddc2464..b26ac6b2966 100644
--- a/addons/account_analytic_default/i18n/sr@latin.po
+++ b/addons/account_analytic_default/i18n/sr@latin.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-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/sv.po b/addons/account_analytic_default/i18n/sv.po
index 918aa3e51c5..d01bfb6106c 100644
--- a/addons/account_analytic_default/i18n/sv.po
+++ b/addons/account_analytic_default/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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/tlh.po b/addons/account_analytic_default/i18n/tlh.po
index f9fa1f10736..70d42286a5e 100644
--- a/addons/account_analytic_default/i18n/tlh.po
+++ b/addons/account_analytic_default/i18n/tlh.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-02-03 06:23+0000\n"
 "Last-Translator: <>\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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,17 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -67,11 +56,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -133,11 +117,6 @@ msgstr ""
 msgid "End Date"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
diff --git a/addons/account_analytic_default/i18n/tr.po b/addons/account_analytic_default/i18n/tr.po
index 91db0deb792..c7eed3ace42 100644
--- a/addons/account_analytic_default/i18n/tr.po
+++ b/addons/account_analytic_default/i18n/tr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-09-09 07:16+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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,17 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Varsayılan Analiz Hes."
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -67,11 +56,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -133,11 +117,6 @@ msgstr "Girdiler"
 msgid "End Date"
 msgstr "Bitiş Tarihi"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -197,6 +176,9 @@ msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
+
 #~ msgid "Seq"
 #~ msgstr "Sıra No"
 
diff --git a/addons/account_analytic_default/i18n/uk.po b/addons/account_analytic_default/i18n/uk.po
index c4993e0f003..ceff0665405 100644
--- a/addons/account_analytic_default/i18n/uk.po
+++ b/addons/account_analytic_default/i18n/uk.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-09-08 12:48+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,18 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -68,11 +56,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -134,11 +117,6 @@ msgstr "Проводки"
 msgid "End Date"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури Вигляду!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -197,3 +175,11 @@ msgstr ""
 msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильний XML для Архітектури Вигляду!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
diff --git a/addons/account_analytic_default/i18n/vi.po b/addons/account_analytic_default/i18n/vi.po
index c06209dbaad..473f6790318 100644
--- a/addons/account_analytic_default/i18n/vi.po
+++ b/addons/account_analytic_default/i18n/vi.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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-27 14:47+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-11-28 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -22,17 +22,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -68,11 +57,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Tên mô hình không hợp lệ trong định nghĩa hành động."
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -96,11 +80,6 @@ msgstr ""
 msgid "Sale Order Line"
 msgstr ""
 
-#. module: account_analytic_default
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytical Account"
@@ -139,11 +118,6 @@ msgstr ""
 msgid "End Date"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -170,11 +144,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: account_analytic_default
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
 msgid "Invoice Line"
@@ -208,7 +177,5 @@ msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
 
-#. module: account_analytic_default
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Tên mô hình không hợp lệ trong định nghĩa hành động."
diff --git a/addons/account_analytic_default/i18n/zh_CN.po b/addons/account_analytic_default/i18n/zh_CN.po
index ac5f167beea..6f49b025a74 100644
--- a/addons/account_analytic_default/i18n/zh_CN.po
+++ b/addons/account_analytic_default/i18n/zh_CN.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-09-29 09:13+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,17 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "默认的科目辅助核算"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -67,11 +56,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "在动作定义使用了无效的模式名称。"
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -133,11 +117,6 @@ msgstr "凭证"
 msgid "End Date"
 msgstr "结束日期"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -200,5 +179,15 @@ msgstr ""
 #~ msgid "Analytic Distributions"
 #~ msgstr "辅助核算分配"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效XML视图结构!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+
 #~ msgid "Seq"
 #~ msgstr "序列"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "在动作定义使用了无效的模式名称。"
diff --git a/addons/account_analytic_default/i18n/zh_TW.po b/addons/account_analytic_default/i18n/zh_TW.po
index bbf3b27bab5..e88e207b587 100644
--- a/addons/account_analytic_default/i18n/zh_TW.po
+++ b/addons/account_analytic_default/i18n/zh_TW.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-09-08 12:47+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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,17 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -67,11 +56,6 @@ msgstr ""
 msgid "Default end date for this Analytical Account"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -133,11 +117,6 @@ msgstr ""
 msgid "End Date"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index afb6b263b3d..f3cec96bbe1 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/ar.po b/addons/account_analytic_plans/i18n/ar.po
index e6d9989651b..3aee9053efe 100644
--- a/addons/account_analytic_plans/i18n/ar.po
+++ b/addons/account_analytic_plans/i18n/ar.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/bg.po b/addons/account_analytic_plans/i18n/bg.po
index afb47cbf769..ca82976c433 100644
--- a/addons/account_analytic_plans/i18n/bg.po
+++ b/addons/account_analytic_plans/i18n/bg.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/bs.po b/addons/account_analytic_plans/i18n/bs.po
index ce174ae6b85..3fb95080e43 100644
--- a/addons/account_analytic_plans/i18n/bs.po
+++ b/addons/account_analytic_plans/i18n/bs.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/ca.po b/addons/account_analytic_plans/i18n/ca.po
index 6910c6a9244..a912fb15a63 100644
--- a/addons/account_analytic_plans/i18n/ca.po
+++ b/addons/account_analytic_plans/i18n/ca.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/cs.po b/addons/account_analytic_plans/i18n/cs.po
index 51cf5b474c9..d12f0bfeb51 100644
--- a/addons/account_analytic_plans/i18n/cs.po
+++ b/addons/account_analytic_plans/i18n/cs.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/de.po b/addons/account_analytic_plans/i18n/de.po
index 19670b91ece..2db435bfe45 100644
--- a/addons/account_analytic_plans/i18n/de.po
+++ b/addons/account_analytic_plans/i18n/de.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/el.po b/addons/account_analytic_plans/i18n/el.po
index 51ef0311aec..7caf59486cf 100644
--- a/addons/account_analytic_plans/i18n/el.po
+++ b/addons/account_analytic_plans/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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/es.po b/addons/account_analytic_plans/i18n/es.po
index 6fcad7f4919..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-11 05:01+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/es_AR.po b/addons/account_analytic_plans/i18n/es_AR.po
index 2657383401f..ca19b373437 100644
--- a/addons/account_analytic_plans/i18n/es_AR.po
+++ b/addons/account_analytic_plans/i18n/es_AR.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/es_EC.po b/addons/account_analytic_plans/i18n/es_EC.po
index 9370013d7e8..321db910cf6 100644
--- a/addons/account_analytic_plans/i18n/es_EC.po
+++ b/addons/account_analytic_plans/i18n/es_EC.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/et.po b/addons/account_analytic_plans/i18n/et.po
index b403aa3c990..a562bb32553 100644
--- a/addons/account_analytic_plans/i18n/et.po
+++ b/addons/account_analytic_plans/i18n/et.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/fi.po b/addons/account_analytic_plans/i18n/fi.po
index 2dda0e7e383..dd673274428 100644
--- a/addons/account_analytic_plans/i18n/fi.po
+++ b/addons/account_analytic_plans/i18n/fi.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/fr.po b/addons/account_analytic_plans/i18n/fr.po
index 9d630035820..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-11 05:01+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/gl.po b/addons/account_analytic_plans/i18n/gl.po
index f38484d634e..cb85b9676ca 100644
--- a/addons/account_analytic_plans/i18n/gl.po
+++ b/addons/account_analytic_plans/i18n/gl.po
@@ -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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/hr.po b/addons/account_analytic_plans/i18n/hr.po
index 2a1d58267f8..801dc483348 100644
--- a/addons/account_analytic_plans/i18n/hr.po
+++ b/addons/account_analytic_plans/i18n/hr.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/hu.po b/addons/account_analytic_plans/i18n/hu.po
index b0822ad05aa..3b3da864e84 100644
--- a/addons/account_analytic_plans/i18n/hu.po
+++ b/addons/account_analytic_plans/i18n/hu.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/id.po b/addons/account_analytic_plans/i18n/id.po
index 6d08d84014c..9684faf40ce 100644
--- a/addons/account_analytic_plans/i18n/id.po
+++ b/addons/account_analytic_plans/i18n/id.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/it.po b/addons/account_analytic_plans/i18n/it.po
index 821ef88b795..40d59ae5f40 100644
--- a/addons/account_analytic_plans/i18n/it.po
+++ b/addons/account_analytic_plans/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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/ko.po b/addons/account_analytic_plans/i18n/ko.po
index 1f2206b1a5e..1161e1b06cb 100644
--- a/addons/account_analytic_plans/i18n/ko.po
+++ b/addons/account_analytic_plans/i18n/ko.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/lt.po b/addons/account_analytic_plans/i18n/lt.po
index 01ba12f4d27..e2b6620560f 100644
--- a/addons/account_analytic_plans/i18n/lt.po
+++ b/addons/account_analytic_plans/i18n/lt.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/mn.po b/addons/account_analytic_plans/i18n/mn.po
index 16410f1896d..2d5b52c1e7c 100644
--- a/addons/account_analytic_plans/i18n/mn.po
+++ b/addons/account_analytic_plans/i18n/mn.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/nl.po b/addons/account_analytic_plans/i18n/nl.po
index 64b0c35b38f..4b469017511 100644
--- a/addons/account_analytic_plans/i18n/nl.po
+++ b/addons/account_analytic_plans/i18n/nl.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/nl_BE.po b/addons/account_analytic_plans/i18n/nl_BE.po
index 0df5679ff0b..d56c5046875 100644
--- a/addons/account_analytic_plans/i18n/nl_BE.po
+++ b/addons/account_analytic_plans/i18n/nl_BE.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/oc.po b/addons/account_analytic_plans/i18n/oc.po
index a67c90d95ff..69e48776c5f 100644
--- a/addons/account_analytic_plans/i18n/oc.po
+++ b/addons/account_analytic_plans/i18n/oc.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/pl.po b/addons/account_analytic_plans/i18n/pl.po
index e63f3a63b7e..4c713a43662 100644
--- a/addons/account_analytic_plans/i18n/pl.po
+++ b/addons/account_analytic_plans/i18n/pl.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/pt.po b/addons/account_analytic_plans/i18n/pt.po
index 0fd7f7688e9..e5bf4cd4e33 100644
--- a/addons/account_analytic_plans/i18n/pt.po
+++ b/addons/account_analytic_plans/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-10 17:14+0000\n"
-"PO-Revision-Date: 2010-12-12 17:48+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 01:33+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: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/pt_BR.po b/addons/account_analytic_plans/i18n/pt_BR.po
index 7ccee84607d..3f3e83afe21 100644
--- a/addons/account_analytic_plans/i18n/pt_BR.po
+++ b/addons/account_analytic_plans/i18n/pt_BR.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/ro.po b/addons/account_analytic_plans/i18n/ro.po
index 4f74837c478..273e094044c 100644
--- a/addons/account_analytic_plans/i18n/ro.po
+++ b/addons/account_analytic_plans/i18n/ro.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/ru.po b/addons/account_analytic_plans/i18n/ru.po
index 0a970ffb261..0f8f299fd14 100644
--- a/addons/account_analytic_plans/i18n/ru.po
+++ b/addons/account_analytic_plans/i18n/ru.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/sl.po b/addons/account_analytic_plans/i18n/sl.po
index 3a5261cd5cb..1f71e542d23 100644
--- a/addons/account_analytic_plans/i18n/sl.po
+++ b/addons/account_analytic_plans/i18n/sl.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/sq.po b/addons/account_analytic_plans/i18n/sq.po
index 5202168f7d0..c35f600a6bf 100644
--- a/addons/account_analytic_plans/i18n/sq.po
+++ b/addons/account_analytic_plans/i18n/sq.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/sr.po b/addons/account_analytic_plans/i18n/sr.po
index 6d80e8ae20d..0e543d9f075 100644
--- a/addons/account_analytic_plans/i18n/sr.po
+++ b/addons/account_analytic_plans/i18n/sr.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/sr@latin.po b/addons/account_analytic_plans/i18n/sr@latin.po
index 73de1fe670a..1714cb4cdf7 100644
--- a/addons/account_analytic_plans/i18n/sr@latin.po
+++ b/addons/account_analytic_plans/i18n/sr@latin.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/sv.po b/addons/account_analytic_plans/i18n/sv.po
index 8eda142ae4a..51ca80ed3a7 100644
--- a/addons/account_analytic_plans/i18n/sv.po
+++ b/addons/account_analytic_plans/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-12 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/tlh.po b/addons/account_analytic_plans/i18n/tlh.po
index c2c4742e7bf..c1c6e0fc845 100644
--- a/addons/account_analytic_plans/i18n/tlh.po
+++ b/addons/account_analytic_plans/i18n/tlh.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po
index c24b1c142ef..e66cf144524 100644
--- a/addons/account_analytic_plans/i18n/tr.po
+++ b/addons/account_analytic_plans/i18n/tr.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/uk.po b/addons/account_analytic_plans/i18n/uk.po
index 2a3ad6d6ffe..85a1b28c4c5 100644
--- a/addons/account_analytic_plans/i18n/uk.po
+++ b/addons/account_analytic_plans/i18n/uk.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/vi.po b/addons/account_analytic_plans/i18n/vi.po
index cffd22f7a69..d6f439024a1 100644
--- a/addons/account_analytic_plans/i18n/vi.po
+++ b/addons/account_analytic_plans/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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/zh_CN.po b/addons/account_analytic_plans/i18n/zh_CN.po
index 9e524afeb9c..0d492ea03b4 100644
--- a/addons/account_analytic_plans/i18n/zh_CN.po
+++ b/addons/account_analytic_plans/i18n/zh_CN.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/zh_TW.po b/addons/account_analytic_plans/i18n/zh_TW.po
index 1f417916917..92fb35f2ffa 100644
--- a/addons/account_analytic_plans/i18n/zh_TW.po
+++ b/addons/account_analytic_plans/i18n/zh_TW.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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+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 e9730e0d7dd..aabfa63709d 100644
--- a/addons/account_anglo_saxon/i18n/pt.po
+++ b/addons/account_anglo_saxon/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:42+0000\n"
-"PO-Revision-Date: 2010-12-12 12:32+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 03:10+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:34+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 0ccf5d71ce8..66cee057d29 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/ar.po b/addons/account_budget/i18n/ar.po
index db1dc16c0d7..654a79995e5 100644
--- a/addons/account_budget/i18n/ar.po
+++ b/addons/account_budget/i18n/ar.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/bg.po b/addons/account_budget/i18n/bg.po
index 81ad034a3f6..8086221374d 100644
--- a/addons/account_budget/i18n/bg.po
+++ b/addons/account_budget/i18n/bg.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/bs.po b/addons/account_budget/i18n/bs.po
index d996b0b7458..7e3f951ee61 100644
--- a/addons/account_budget/i18n/bs.po
+++ b/addons/account_budget/i18n/bs.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/ca.po b/addons/account_budget/i18n/ca.po
index 1030ad4b0b2..7f9e3d7be8a 100644
--- a/addons/account_budget/i18n/ca.po
+++ b/addons/account_budget/i18n/ca.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/cs.po b/addons/account_budget/i18n/cs.po
index a5510abef4f..0adf91731f3 100644
--- a/addons/account_budget/i18n/cs.po
+++ b/addons/account_budget/i18n/cs.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/de.po b/addons/account_budget/i18n/de.po
index d7febe92983..76b02d2f95d 100644
--- a/addons/account_budget/i18n/de.po
+++ b/addons/account_budget/i18n/de.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/el.po b/addons/account_budget/i18n/el.po
index fefeea05094..9e01b7d2ef6 100644
--- a/addons/account_budget/i18n/el.po
+++ b/addons/account_budget/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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/es.po b/addons/account_budget/i18n/es.po
index 461967274a6..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-14 05:29+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/es_AR.po b/addons/account_budget/i18n/es_AR.po
index 49331978d77..0fabd97c0a2 100644
--- a/addons/account_budget/i18n/es_AR.po
+++ b/addons/account_budget/i18n/es_AR.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-14 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/es_EC.po b/addons/account_budget/i18n/es_EC.po
index 6ffcb8a8d9d..ed2dea714e8 100644
--- a/addons/account_budget/i18n/es_EC.po
+++ b/addons/account_budget/i18n/es_EC.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-14 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/et.po b/addons/account_budget/i18n/et.po
index 9ff2be5b007..e3e0095ca99 100644
--- a/addons/account_budget/i18n/et.po
+++ b/addons/account_budget/i18n/et.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/fi.po b/addons/account_budget/i18n/fi.po
index 2e4d05f0d33..bcee3c86212 100644
--- a/addons/account_budget/i18n/fi.po
+++ b/addons/account_budget/i18n/fi.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/fr.po b/addons/account_budget/i18n/fr.po
index 9890b6cf93c..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-14 05:29+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/gl.po b/addons/account_budget/i18n/gl.po
index 8902ebbed2c..3b235e9087a 100644
--- a/addons/account_budget/i18n/gl.po
+++ b/addons/account_budget/i18n/gl.po
@@ -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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/hi.po b/addons/account_budget/i18n/hi.po
index 0148934e73d..3eb9632e546 100644
--- a/addons/account_budget/i18n/hi.po
+++ b/addons/account_budget/i18n/hi.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/hr.po b/addons/account_budget/i18n/hr.po
index a8b28e1f508..3a477ce8f3e 100644
--- a/addons/account_budget/i18n/hr.po
+++ b/addons/account_budget/i18n/hr.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/hu.po b/addons/account_budget/i18n/hu.po
index ad6b14c2ca6..c8e6c10856a 100644
--- a/addons/account_budget/i18n/hu.po
+++ b/addons/account_budget/i18n/hu.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/id.po b/addons/account_budget/i18n/id.po
index dc7a1251f10..dd4419eaebf 100644
--- a/addons/account_budget/i18n/id.po
+++ b/addons/account_budget/i18n/id.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/it.po b/addons/account_budget/i18n/it.po
index 472bd2043d0..70acecc371b 100644
--- a/addons/account_budget/i18n/it.po
+++ b/addons/account_budget/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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/ko.po b/addons/account_budget/i18n/ko.po
index 1ab0ec8b8ad..f3f66cceeeb 100644
--- a/addons/account_budget/i18n/ko.po
+++ b/addons/account_budget/i18n/ko.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po
index 66c236ac89b..e511e6f20a4 100644
--- a/addons/account_budget/i18n/lt.po
+++ b/addons/account_budget/i18n/lt.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/mn.po b/addons/account_budget/i18n/mn.po
index e8886e77a4e..7a262fb514c 100644
--- a/addons/account_budget/i18n/mn.po
+++ b/addons/account_budget/i18n/mn.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/nl.po b/addons/account_budget/i18n/nl.po
index 32a6dce6cfe..d1f480bf827 100644
--- a/addons/account_budget/i18n/nl.po
+++ b/addons/account_budget/i18n/nl.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/nl_BE.po b/addons/account_budget/i18n/nl_BE.po
index 91fd2edce5c..28efc8c6f1e 100644
--- a/addons/account_budget/i18n/nl_BE.po
+++ b/addons/account_budget/i18n/nl_BE.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-14 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/oc.po b/addons/account_budget/i18n/oc.po
index 0c8956b41e6..dd23324c6cb 100644
--- a/addons/account_budget/i18n/oc.po
+++ b/addons/account_budget/i18n/oc.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/pl.po b/addons/account_budget/i18n/pl.po
index e5de72131fc..80650dc20e3 100644
--- a/addons/account_budget/i18n/pl.po
+++ b/addons/account_budget/i18n/pl.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/pt.po b/addons/account_budget/i18n/pt.po
index eefdd36d8bd..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-14 05:29+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/i18n/pt_BR.po b/addons/account_budget/i18n/pt_BR.po
index 1ace2386da3..b53d5f43a83 100644
--- a/addons/account_budget/i18n/pt_BR.po
+++ b/addons/account_budget/i18n/pt_BR.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-14 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/ro.po b/addons/account_budget/i18n/ro.po
index 11e8da71870..e82b82d1974 100644
--- a/addons/account_budget/i18n/ro.po
+++ b/addons/account_budget/i18n/ro.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/ru.po b/addons/account_budget/i18n/ru.po
index b15ae3a12d8..29b5491b254 100644
--- a/addons/account_budget/i18n/ru.po
+++ b/addons/account_budget/i18n/ru.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/sl.po b/addons/account_budget/i18n/sl.po
index 1e9fb3f5c68..7692400b749 100644
--- a/addons/account_budget/i18n/sl.po
+++ b/addons/account_budget/i18n/sl.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/sq.po b/addons/account_budget/i18n/sq.po
index 9da4c1e192d..ce78824ddfb 100644
--- a/addons/account_budget/i18n/sq.po
+++ b/addons/account_budget/i18n/sq.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/sr.po b/addons/account_budget/i18n/sr.po
index c187b2b6904..9ac87e18b73 100644
--- a/addons/account_budget/i18n/sr.po
+++ b/addons/account_budget/i18n/sr.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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/sr@latin.po b/addons/account_budget/i18n/sr@latin.po
index 7d20ced8742..bce65afb1d2 100644
--- a/addons/account_budget/i18n/sr@latin.po
+++ b/addons/account_budget/i18n/sr@latin.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-14 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/sv.po b/addons/account_budget/i18n/sv.po
index b9ae77d1c0d..cff82b444d2 100644
--- a/addons/account_budget/i18n/sv.po
+++ b/addons/account_budget/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-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/tlh.po b/addons/account_budget/i18n/tlh.po
index c51dfc6a673..ff30ab0d8b2 100644
--- a/addons/account_budget/i18n/tlh.po
+++ b/addons/account_budget/i18n/tlh.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-14 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po
index afd51a56f2b..75563111aa5 100644
--- a/addons/account_budget/i18n/tr.po
+++ b/addons/account_budget/i18n/tr.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-14 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/uk.po b/addons/account_budget/i18n/uk.po
index fdcca688030..b67cedbfd3a 100644
--- a/addons/account_budget/i18n/uk.po
+++ b/addons/account_budget/i18n/uk.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-14 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/vi.po b/addons/account_budget/i18n/vi.po
index f9a8adda7a6..a3afc8f2a39 100644
--- a/addons/account_budget/i18n/vi.po
+++ b/addons/account_budget/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-14 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/zh_CN.po b/addons/account_budget/i18n/zh_CN.po
index 64360890808..d199f7db97a 100644
--- a/addons/account_budget/i18n/zh_CN.po
+++ b/addons/account_budget/i18n/zh_CN.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-14 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/zh_TW.po b/addons/account_budget/i18n/zh_TW.po
index a13385bf50a..9cd4a62e110 100644
--- a/addons/account_budget/i18n/zh_TW.po
+++ b/addons/account_budget/i18n/zh_TW.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-14 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+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_chart/i18n/ar.po b/addons/account_chart/i18n/ar.po
index 7f9ed6184f2..ce077d9f86c 100644
--- a/addons/account_chart/i18n/ar.po
+++ b/addons/account_chart/i18n/ar.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/bg.po b/addons/account_chart/i18n/bg.po
index 512e11f9c1d..b311fa00f5f 100644
--- a/addons/account_chart/i18n/bg.po
+++ b/addons/account_chart/i18n/bg.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/bs.po b/addons/account_chart/i18n/bs.po
index a25da9ac9dd..385afde9b9f 100644
--- a/addons/account_chart/i18n/bs.po
+++ b/addons/account_chart/i18n/bs.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/ca.po b/addons/account_chart/i18n/ca.po
index 0d5038a623f..5e3608e2411 100644
--- a/addons/account_chart/i18n/ca.po
+++ b/addons/account_chart/i18n/ca.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/cs.po b/addons/account_chart/i18n/cs.po
index f0e37e70867..bd3e6ceca11 100644
--- a/addons/account_chart/i18n/cs.po
+++ b/addons/account_chart/i18n/cs.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/da.po b/addons/account_chart/i18n/da.po
index cf0183daab6..ce919afb484 100644
--- a/addons/account_chart/i18n/da.po
+++ b/addons/account_chart/i18n/da.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/de.po b/addons/account_chart/i18n/de.po
index eb49d66cc8c..f7be2a13cd1 100644
--- a/addons/account_chart/i18n/de.po
+++ b/addons/account_chart/i18n/de.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/el.po b/addons/account_chart/i18n/el.po
index c849c7748b4..65275027023 100644
--- a/addons/account_chart/i18n/el.po
+++ b/addons/account_chart/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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/es.po b/addons/account_chart/i18n/es.po
index 7acb040bdf6..c9ce94cf50b 100644
--- a/addons/account_chart/i18n/es.po
+++ b/addons/account_chart/i18n/es.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/es_AR.po b/addons/account_chart/i18n/es_AR.po
index b4f271d0934..6c6837a7731 100644
--- a/addons/account_chart/i18n/es_AR.po
+++ b/addons/account_chart/i18n/es_AR.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/es_EC.po b/addons/account_chart/i18n/es_EC.po
index 694c51e8294..2381fbd899a 100644
--- a/addons/account_chart/i18n/es_EC.po
+++ b/addons/account_chart/i18n/es_EC.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/et.po b/addons/account_chart/i18n/et.po
index 22f7b7e8271..7146caee046 100644
--- a/addons/account_chart/i18n/et.po
+++ b/addons/account_chart/i18n/et.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/eu.po b/addons/account_chart/i18n/eu.po
index ec4f5ba832e..677697d1150 100644
--- a/addons/account_chart/i18n/eu.po
+++ b/addons/account_chart/i18n/eu.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/fi.po b/addons/account_chart/i18n/fi.po
index b97979c4d61..6623e8260f0 100644
--- a/addons/account_chart/i18n/fi.po
+++ b/addons/account_chart/i18n/fi.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/fr.po b/addons/account_chart/i18n/fr.po
index 9b53c878cf0..09d5c9c8af8 100644
--- a/addons/account_chart/i18n/fr.po
+++ b/addons/account_chart/i18n/fr.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/gl.po b/addons/account_chart/i18n/gl.po
index 677e76ce8d1..ff645dcfe4e 100644
--- a/addons/account_chart/i18n/gl.po
+++ b/addons/account_chart/i18n/gl.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/hi.po b/addons/account_chart/i18n/hi.po
index d20dbd7047b..2358301064e 100644
--- a/addons/account_chart/i18n/hi.po
+++ b/addons/account_chart/i18n/hi.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/hr.po b/addons/account_chart/i18n/hr.po
index 55a5cdda1a5..05244c55d1e 100644
--- a/addons/account_chart/i18n/hr.po
+++ b/addons/account_chart/i18n/hr.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/hu.po b/addons/account_chart/i18n/hu.po
index 97426f06c1d..8a1b1af37d8 100644
--- a/addons/account_chart/i18n/hu.po
+++ b/addons/account_chart/i18n/hu.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/id.po b/addons/account_chart/i18n/id.po
index 1c25877fb90..884ec584609 100644
--- a/addons/account_chart/i18n/id.po
+++ b/addons/account_chart/i18n/id.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/it.po b/addons/account_chart/i18n/it.po
index de3a9b9b769..174f11d1c1b 100644
--- a/addons/account_chart/i18n/it.po
+++ b/addons/account_chart/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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/ko.po b/addons/account_chart/i18n/ko.po
index 4fa34289971..e7b223a47e4 100644
--- a/addons/account_chart/i18n/ko.po
+++ b/addons/account_chart/i18n/ko.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/lt.po b/addons/account_chart/i18n/lt.po
index 25e0be9b006..f36653fae16 100644
--- a/addons/account_chart/i18n/lt.po
+++ b/addons/account_chart/i18n/lt.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/lv.po b/addons/account_chart/i18n/lv.po
index 342115f822e..86b4bef1518 100644
--- a/addons/account_chart/i18n/lv.po
+++ b/addons/account_chart/i18n/lv.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/mn.po b/addons/account_chart/i18n/mn.po
index 45ee8499c49..b0224195369 100644
--- a/addons/account_chart/i18n/mn.po
+++ b/addons/account_chart/i18n/mn.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/nb.po b/addons/account_chart/i18n/nb.po
index 5ea75ce1926..4cfb395eb88 100644
--- a/addons/account_chart/i18n/nb.po
+++ b/addons/account_chart/i18n/nb.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/nl.po b/addons/account_chart/i18n/nl.po
index bb4281b85fa..3a3308bc46a 100644
--- a/addons/account_chart/i18n/nl.po
+++ b/addons/account_chart/i18n/nl.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/nl_BE.po b/addons/account_chart/i18n/nl_BE.po
index 9313abad62b..8987bc62bc5 100644
--- a/addons/account_chart/i18n/nl_BE.po
+++ b/addons/account_chart/i18n/nl_BE.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/oc.po b/addons/account_chart/i18n/oc.po
index d8708d07061..7aed0f714a5 100644
--- a/addons/account_chart/i18n/oc.po
+++ b/addons/account_chart/i18n/oc.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/pl.po b/addons/account_chart/i18n/pl.po
index f65d48c7abc..fdac7f6119d 100644
--- a/addons/account_chart/i18n/pl.po
+++ b/addons/account_chart/i18n/pl.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/pt.po b/addons/account_chart/i18n/pt.po
index beb15983199..631f87e8b2d 100644
--- a/addons/account_chart/i18n/pt.po
+++ b/addons/account_chart/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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/pt_BR.po b/addons/account_chart/i18n/pt_BR.po
index b93bfa785d8..74f2ed50682 100644
--- a/addons/account_chart/i18n/pt_BR.po
+++ b/addons/account_chart/i18n/pt_BR.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/ro.po b/addons/account_chart/i18n/ro.po
index c1546801d9f..2cfe37dc503 100644
--- a/addons/account_chart/i18n/ro.po
+++ b/addons/account_chart/i18n/ro.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/ru.po b/addons/account_chart/i18n/ru.po
index 55b7ca21e80..cbe966024bb 100644
--- a/addons/account_chart/i18n/ru.po
+++ b/addons/account_chart/i18n/ru.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/sk.po b/addons/account_chart/i18n/sk.po
index 96e2c8f75eb..5f98e9cf006 100644
--- a/addons/account_chart/i18n/sk.po
+++ b/addons/account_chart/i18n/sk.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/sl.po b/addons/account_chart/i18n/sl.po
index 280b8a4ccd7..a005cb0d230 100644
--- a/addons/account_chart/i18n/sl.po
+++ b/addons/account_chart/i18n/sl.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/sq.po b/addons/account_chart/i18n/sq.po
index dfbe3d1ea36..7f2d380b98c 100644
--- a/addons/account_chart/i18n/sq.po
+++ b/addons/account_chart/i18n/sq.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/sr.po b/addons/account_chart/i18n/sr.po
index c78d384be93..a2a5a2b62e9 100644
--- a/addons/account_chart/i18n/sr.po
+++ b/addons/account_chart/i18n/sr.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/sr@latin.po b/addons/account_chart/i18n/sr@latin.po
index f3831bb893e..df5969b805e 100644
--- a/addons/account_chart/i18n/sr@latin.po
+++ b/addons/account_chart/i18n/sr@latin.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/sv.po b/addons/account_chart/i18n/sv.po
index 1c01e6f3de2..c2845e25d4a 100644
--- a/addons/account_chart/i18n/sv.po
+++ b/addons/account_chart/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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/ta.po b/addons/account_chart/i18n/ta.po
index d0c9a1c09ed..d8a9a1799e1 100644
--- a/addons/account_chart/i18n/ta.po
+++ b/addons/account_chart/i18n/ta.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/th.po b/addons/account_chart/i18n/th.po
index 42d03ba63b2..c895346525b 100644
--- a/addons/account_chart/i18n/th.po
+++ b/addons/account_chart/i18n/th.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/tr.po b/addons/account_chart/i18n/tr.po
index 7e61c5dee9c..10b1d09d294 100644
--- a/addons/account_chart/i18n/tr.po
+++ b/addons/account_chart/i18n/tr.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/uk.po b/addons/account_chart/i18n/uk.po
index 4740b8134f6..bec514dcad8 100644
--- a/addons/account_chart/i18n/uk.po
+++ b/addons/account_chart/i18n/uk.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/vi.po b/addons/account_chart/i18n/vi.po
index 6f62f8e708c..c08b4229510 100644
--- a/addons/account_chart/i18n/vi.po
+++ b/addons/account_chart/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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/zh_CN.po b/addons/account_chart/i18n/zh_CN.po
index 95c37d94171..9da3a4df8d1 100644
--- a/addons/account_chart/i18n/zh_CN.po
+++ b/addons/account_chart/i18n/zh_CN.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/zh_TW.po b/addons/account_chart/i18n/zh_TW.po
index c09f2f4ed70..8a1b1af37d8 100644
--- a/addons/account_chart/i18n/zh_TW.po
+++ b/addons/account_chart/i18n/zh_TW.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
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/i18n/ar.po b/addons/account_coda/i18n/ar.po
index 889d47ca025..711b8452333 100644
--- a/addons/account_coda/i18n/ar.po
+++ b/addons/account_coda/i18n/ar.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-09-09 07:22+0000\n"
 "Last-Translator: bamuhrez <bamuhrez@gmail.com>\n"
 "Language-Team: Arabic <ar@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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
@@ -24,15 +24,10 @@ msgid "Bank Journal"
 msgstr "سجل البنك"
 
 #. module: account_coda
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: account_coda
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "سجل"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda_import
@@ -59,11 +54,6 @@ msgstr ""
 msgid "Import Date"
 msgstr ""
 
-#. module: account_coda
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_coda
 #: field:account.coda,note:0
 msgid "Import log"
@@ -80,10 +70,10 @@ msgid "Coda import"
 msgstr ""
 
 #. module: account_coda
-#: view:account.coda:0
-#: field:account.coda.import,note:0
-msgid "Log"
-msgstr "سجل"
+#: code:addons/account_coda/account_coda.py:0
+#, python-format
+msgid "Coda file not found for bank statement !!"
+msgstr ""
 
 #. module: account_coda
 #: help:account.coda.import,awaiting_account:0
@@ -127,11 +117,6 @@ msgstr ""
 msgid "Coda Import Logs"
 msgstr ""
 
-#. module: account_coda
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "هناك خطأ في XML للعرض!"
-
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
 msgid "coda for an Account"
@@ -157,6 +142,12 @@ msgstr ""
 msgid "Open Statements"
 msgstr ""
 
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:0
+#, python-format
+msgid "The bank account %s is not defined for the partner %s.\n"
+msgstr ""
+
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_import
 msgid "Import Coda Statements"
@@ -173,11 +164,6 @@ msgstr ""
 msgid "Statements"
 msgstr ""
 
-#. module: account_coda
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: account_coda
 #: field:account.bank.statement,coda_id:0
 msgid "Coda"
@@ -257,18 +243,15 @@ msgstr ""
 msgid "Coda Import"
 msgstr ""
 
-#. module: account_coda
-#: code:addons/account_coda/wizard/account_coda_import.py:0
-#, python-format
-msgid "The bank account %s is not defined for the partner %s.\n"
-msgstr ""
-
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,journal_id:0
 msgid "Journal"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "هناك خطأ في XML للعرض!"
+
 #~ msgid "_Close"
 #~ msgstr "إ_غلاق"
 
diff --git a/addons/account_coda/i18n/de.po b/addons/account_coda/i18n/de.po
index 8bac10de9ed..5e800f5f488 100644
--- a/addons/account_coda/i18n/de.po
+++ b/addons/account_coda/i18n/de.po
@@ -6,7 +6,7 @@ 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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-30 14:31+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -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-01 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
@@ -24,17 +24,10 @@ msgid "Bank Journal"
 msgstr "Bank Journal"
 
 #. module: account_coda
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Die Objektbezeichnung muss mit x_ beginnen und darf keine Sonderzeichen "
-"beinhalten!"
-
-#. module: account_coda
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Fehler bei Modellbezeichnung der Aktion"
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Protokoll"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda_import
@@ -61,11 +54,6 @@ msgstr "Standard Konto für nicht erkannte Buchung"
 msgid "Import Date"
 msgstr "Importiere Datum"
 
-#. module: account_coda
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
 #. module: account_coda
 #: field:account.coda,note:0
 msgid "Import log"
@@ -81,17 +69,6 @@ msgstr "Import"
 msgid "Coda import"
 msgstr "CODA Import"
 
-#. module: account_coda
-#: view:account.coda:0
-#: field:account.coda.import,note:0
-msgid "Log"
-msgstr "Protokoll"
-
-#. module: account_coda
-#: 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 !"
-
 #. module: account_coda
 #: code:addons/account_coda/account_coda.py:0
 #, python-format
@@ -144,11 +121,6 @@ msgstr "Datum"
 msgid "Coda Import Logs"
 msgstr "Coda Import Protokolle"
 
-#. module: account_coda
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter XML Quellcode für diese Ansicht"
-
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
 msgid "coda for an Account"
@@ -160,11 +132,9 @@ msgid "Default Payable Account"
 msgstr "Standard Kreditoren Konto"
 
 #. module: account_coda
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-"Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-"vorhanden sein !"
+#: help:account.coda,name:0
+msgid "Store the detail of bank statements"
+msgstr "Speiche Details zu Bankauszügen"
 
 #. module: account_coda
 #: view:account.coda.import:0
@@ -176,11 +146,6 @@ msgstr "Abbrechen"
 msgid "Open Statements"
 msgstr "Offene Auszüge"
 
-#. module: account_coda
-#: help:account.coda,name:0
-msgid "Store the detail of bank statements"
-msgstr "Speiche Details zu Bankauszügen"
-
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:0
 #, python-format
@@ -203,21 +168,11 @@ msgstr "Import CODA Bankauszug"
 msgid "Statements"
 msgstr "Bankauszüge"
 
-#. module: account_coda
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Regeln werden nur unterstützt für osv_memory Objekte !"
-
 #. module: account_coda
 #: field:account.bank.statement,coda_id:0
 msgid "Coda"
 msgstr "CODA"
 
-#. module: account_coda
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Results :"
@@ -294,17 +249,18 @@ msgstr "Konfiguriere Journal und Konto :"
 msgid "Coda Import"
 msgstr "Coda Import"
 
-#. module: account_coda
-#: 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 !"
-
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,journal_id:0
 msgid "Journal"
 msgstr "Journal"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Die Objektbezeichnung muss mit x_ beginnen und darf keine Sonderzeichen "
+#~ "beinhalten!"
+
 #~ msgid "_Open Statement"
 #~ msgstr "Öffne Bankauszug"
 
@@ -317,6 +273,9 @@ msgstr "Journal"
 #~ msgid "Import Coda File"
 #~ msgstr "Import CODA Datei"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Fehler bei Modellbezeichnung der Aktion"
+
 #~ msgid "Default receivable Account"
 #~ msgstr "Standard Debitoren Konto"
 
@@ -336,6 +295,9 @@ msgstr "Journal"
 #~ msgid "Generated Bank Statement"
 #~ msgstr "Erzeugter Bankauszug"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht"
+
 #~ msgid "Coda Statements"
 #~ msgstr "CODA Bankauszüge"
 
@@ -344,3 +306,23 @@ msgstr "Journal"
 
 #~ msgid "Select your bank journal :"
 #~ msgstr "Wähle Bank Journal :"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Regeln werden nur unterstützt für osv_memory Objekte !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr ""
+#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
+#~ "vorhanden sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/account_coda/i18n/el.po b/addons/account_coda/i18n/el.po
index ad626e1ea31..c1cf2790342 100644
--- a/addons/account_coda/i18n/el.po
+++ b/addons/account_coda/i18n/el.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-14 08:11+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-11-15 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
@@ -24,17 +24,10 @@ msgid "Bank Journal"
 msgstr "Ημερολόγιο τράπεζας"
 
 #. module: account_coda
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Το όνομα του Αντικειμένου πρέπει να ξεκινά με x_ και δεν πρέπει να περιέχει "
-"ειδικούς χαρακτήρες!"
-
-#. module: account_coda
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Καταγραφή"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda_import
@@ -61,11 +54,6 @@ msgstr "Προεπιλεγμένος Λογαριασμός για μη Αναγ
 msgid "Import Date"
 msgstr "Εισαγωγή ημερομηνίας"
 
-#. module: account_coda
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Λάθος ! Δεν μπορείς να δημιουργήσεις κενό Μενού"
-
 #. module: account_coda
 #: field:account.coda,note:0
 msgid "Import log"
@@ -82,10 +70,10 @@ msgid "Coda import"
 msgstr "Εισαγωγή Coda"
 
 #. module: account_coda
-#: view:account.coda:0
-#: field:account.coda.import,note:0
-msgid "Log"
-msgstr "Καταγραφή"
+#: code:addons/account_coda/account_coda.py:0
+#, python-format
+msgid "Coda file not found for bank statement !!"
+msgstr ""
 
 #. module: account_coda
 #: help:account.coda.import,awaiting_account:0
@@ -131,11 +119,6 @@ msgstr "Ημερομηνία"
 msgid "Coda Import Logs"
 msgstr ""
 
-#. module: account_coda
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Λανθασμένο XML για αρχιτεκτονική όψης!"
-
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
 msgid "coda for an Account"
@@ -161,6 +144,12 @@ msgstr "Άκυρο"
 msgid "Open Statements"
 msgstr ""
 
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:0
+#, python-format
+msgid "The bank account %s is not defined for the partner %s.\n"
+msgstr "Ο λογαριασμός τραπέζης %s δεν έχει οριστεί για τον συνεργάτη %s.\n"
+
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_import
 msgid "Import Coda Statements"
@@ -177,11 +166,6 @@ msgstr "Εισαγωγή λογαριασμών Coda"
 msgid "Statements"
 msgstr ""
 
-#. module: account_coda
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: account_coda
 #: field:account.bank.statement,coda_id:0
 msgid "Coda"
@@ -261,12 +245,6 @@ msgstr "Παραμετροποίησε το Ημερολόγιο και τον 
 msgid "Coda Import"
 msgstr ""
 
-#. module: account_coda
-#: code:addons/account_coda/wizard/account_coda_import.py:0
-#, python-format
-msgid "The bank account %s is not defined for the partner %s.\n"
-msgstr "Ο λογαριασμός τραπέζης %s δεν έχει οριστεί για τον συνεργάτη %s.\n"
-
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,journal_id:0
@@ -276,6 +254,18 @@ msgstr "Ημερολόγιο"
 #~ msgid "Clic on 'New' to select your file :"
 #~ msgstr "Πατήστε \"Νέο\" για να επιλέξετε το αρχείο σας"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Το όνομα του Αντικειμένου πρέπει να ξεκινά με x_ και δεν πρέπει να περιέχει "
+#~ "ειδικούς χαρακτήρες!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Λανθασμένο XML για αρχιτεκτονική όψης!"
+
 #~ msgid "Default receivable Account"
 #~ msgstr "Προεπιλεγμένος λογαριασμός είσπραξης"
 
@@ -312,3 +302,6 @@ msgstr "Ημερολόγιο"
 
 #~ msgid "Select your bank journal :"
 #~ msgstr "Επιλέξτε το ημερολόγιο τράπεζά σας :"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Λάθος ! Δεν μπορείς να δημιουργήσεις κενό Μενού"
diff --git a/addons/account_coda/i18n/es.po b/addons/account_coda/i18n/es.po
index 4490dcc6a06..d00d2276af4 100644
--- a/addons/account_coda/i18n/es.po
+++ b/addons/account_coda/i18n/es.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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-23 09:19+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
@@ -25,16 +25,10 @@ msgid "Bank Journal"
 msgstr "Diario bancario"
 
 #. module: account_coda
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El objeto debe empezar con  x_ y no puede contener ningún carácter especial!"
-
-#. module: account_coda
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo inválido en la definición de acción."
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Registro"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda_import
@@ -61,11 +55,6 @@ msgstr "Cuenta por defecto para movimientos no reconocidos"
 msgid "Import Date"
 msgstr "Fecha de importación"
 
-#. module: account_coda
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
-
 #. module: account_coda
 #: field:account.coda,note:0
 msgid "Import log"
@@ -81,17 +70,6 @@ msgstr "Importar"
 msgid "Coda import"
 msgstr "Importar Coda"
 
-#. module: account_coda
-#: view:account.coda:0
-#: field:account.coda.import,note:0
-msgid "Log"
-msgstr "Registro"
-
-#. module: account_coda
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: account_coda
 #: code:addons/account_coda/account_coda.py:0
 #, python-format
@@ -144,11 +122,6 @@ msgstr "Fecha"
 msgid "Coda Import Logs"
 msgstr "Historial importación Code"
 
-#. module: account_coda
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la estructura de la vista!"
-
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
 msgid "coda for an Account"
@@ -160,9 +133,9 @@ msgid "Default Payable Account"
 msgstr "Cuenta a pagar por defecto"
 
 #. module: account_coda
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
+#: help:account.coda,name:0
+msgid "Store the detail of bank statements"
+msgstr "Guarda el detalle de extractos bancarios."
 
 #. module: account_coda
 #: view:account.coda.import:0
@@ -174,11 +147,6 @@ msgstr "Cancelar"
 msgid "Open Statements"
 msgstr "Abrir extractos"
 
-#. module: account_coda
-#: help:account.coda,name:0
-msgid "Store the detail of bank statements"
-msgstr "Guarda el detalle de extractos bancarios."
-
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:0
 #, python-format
@@ -201,21 +169,11 @@ msgstr "Importar extracto Coda"
 msgid "Statements"
 msgstr "Extractos"
 
-#. module: account_coda
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "¡Las reglas no son soportadas en objetos osv_memory!"
-
 #. module: account_coda
 #: field:account.bank.statement,coda_id:0
 msgid "Coda"
 msgstr "Coda"
 
-#. module: account_coda
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Results :"
@@ -292,17 +250,23 @@ msgstr "Configure su diario y cuenta :"
 msgid "Coda Import"
 msgstr "Importación Coda"
 
-#. module: account_coda
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,journal_id:0
 msgid "Journal"
 msgstr "Diario"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El objeto debe empezar con  x_ y no puede contener ningún carácter especial!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo inválido en la definición de acción."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la estructura de la vista!"
+
 #~ msgid "Default receivable Account"
 #~ msgstr "Cuenta a recibir por defecto"
 
@@ -317,3 +281,21 @@ msgstr "Diario"
 
 #~ msgid "Select your bank journal :"
 #~ msgstr "Seleccione su diario bancario :"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "¡Las reglas no son soportadas en objetos osv_memory!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/account_coda/i18n/es_EC.po b/addons/account_coda/i18n/es_EC.po
index 4d760e3475d..fdfa2cb3452 100644
--- a/addons/account_coda/i18n/es_EC.po
+++ b/addons/account_coda/i18n/es_EC.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-09-17 17:38+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-10-30 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
@@ -24,16 +24,10 @@ msgid "Bank Journal"
 msgstr "Diario bancario"
 
 #. module: account_coda
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El objeto debe empezar con  x_ y no puede contener ningún carácter especial!"
-
-#. module: account_coda
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo inválido en la definición de acción."
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Registro"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda_import
@@ -60,11 +54,6 @@ msgstr ""
 msgid "Import Date"
 msgstr "Fecha de importación"
 
-#. module: account_coda
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_coda
 #: field:account.coda,note:0
 msgid "Import log"
@@ -81,10 +70,10 @@ msgid "Coda import"
 msgstr ""
 
 #. module: account_coda
-#: view:account.coda:0
-#: field:account.coda.import,note:0
-msgid "Log"
-msgstr "Registro"
+#: code:addons/account_coda/account_coda.py:0
+#, python-format
+msgid "Coda file not found for bank statement !!"
+msgstr ""
 
 #. module: account_coda
 #: help:account.coda.import,awaiting_account:0
@@ -128,11 +117,6 @@ msgstr ""
 msgid "Coda Import Logs"
 msgstr ""
 
-#. module: account_coda
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la estructura de la vista!"
-
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
 msgid "coda for an Account"
@@ -158,6 +142,12 @@ msgstr ""
 msgid "Open Statements"
 msgstr ""
 
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:0
+#, python-format
+msgid "The bank account %s is not defined for the partner %s.\n"
+msgstr ""
+
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_import
 msgid "Import Coda Statements"
@@ -174,11 +164,6 @@ msgstr ""
 msgid "Statements"
 msgstr ""
 
-#. module: account_coda
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: account_coda
 #: field:account.bank.statement,coda_id:0
 msgid "Coda"
@@ -258,12 +243,6 @@ msgstr ""
 msgid "Coda Import"
 msgstr ""
 
-#. module: account_coda
-#: code:addons/account_coda/wizard/account_coda_import.py:0
-#, python-format
-msgid "The bank account %s is not defined for the partner %s.\n"
-msgstr ""
-
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,journal_id:0
diff --git a/addons/account_coda/i18n/et.po b/addons/account_coda/i18n/et.po
index 5d68b6128d7..3f8c3f2c4be 100644
--- a/addons/account_coda/i18n/et.po
+++ b/addons/account_coda/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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-06-08 17:34+0000\n"
 "Last-Translator: lyyser <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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
@@ -24,16 +24,10 @@ msgid "Bank Journal"
 msgstr ""
 
 #. module: account_coda
-#: 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: account_coda
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Logi"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda_import
@@ -60,11 +54,6 @@ msgstr ""
 msgid "Import Date"
 msgstr "Importimise aeg"
 
-#. module: account_coda
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_coda
 #: field:account.coda,note:0
 msgid "Import log"
@@ -81,10 +70,10 @@ msgid "Coda import"
 msgstr ""
 
 #. module: account_coda
-#: view:account.coda:0
-#: field:account.coda.import,note:0
-msgid "Log"
-msgstr "Logi"
+#: code:addons/account_coda/account_coda.py:0
+#, python-format
+msgid "Coda file not found for bank statement !!"
+msgstr ""
 
 #. module: account_coda
 #: help:account.coda.import,awaiting_account:0
@@ -128,11 +117,6 @@ msgstr ""
 msgid "Coda Import Logs"
 msgstr ""
 
-#. module: account_coda
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
 msgid "coda for an Account"
@@ -158,6 +142,12 @@ msgstr ""
 msgid "Open Statements"
 msgstr ""
 
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:0
+#, python-format
+msgid "The bank account %s is not defined for the partner %s.\n"
+msgstr ""
+
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_import
 msgid "Import Coda Statements"
@@ -174,11 +164,6 @@ msgstr ""
 msgid "Statements"
 msgstr ""
 
-#. module: account_coda
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: account_coda
 #: field:account.bank.statement,coda_id:0
 msgid "Coda"
@@ -258,18 +243,23 @@ msgstr ""
 msgid "Coda Import"
 msgstr ""
 
-#. module: account_coda
-#: code:addons/account_coda/wizard/account_coda_import.py:0
-#, python-format
-msgid "The bank account %s is not defined for the partner %s.\n"
-msgstr ""
-
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,journal_id:0
 msgid "Journal"
 msgstr ""
 
+#~ 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 model name in the action definition."
+#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Vigane XML vaate arhitektuurile!"
+
 #~ msgid "_Close"
 #~ msgstr "_Sulge"
 
diff --git a/addons/account_coda/i18n/fr.po b/addons/account_coda/i18n/fr.po
index e76b695afa6..3212e02e182 100644
--- a/addons/account_coda/i18n/fr.po
+++ b/addons/account_coda/i18n/fr.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
diff --git a/addons/account_coda/i18n/hr.po b/addons/account_coda/i18n/hr.po
index b758a08405c..3f597f733e1 100644
--- a/addons/account_coda/i18n/hr.po
+++ b/addons/account_coda/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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-10-15 09:33+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
@@ -24,16 +24,10 @@ msgid "Bank Journal"
 msgstr "Dnevnik banke"
 
 #. module: account_coda
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta mora počinjati s x_ i ne smije sadržavati posebne znakove !"
-
-#. module: account_coda
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Zapisnik"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda_import
@@ -60,11 +54,6 @@ msgstr ""
 msgid "Import Date"
 msgstr ""
 
-#. module: account_coda
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_coda
 #: field:account.coda,note:0
 msgid "Import log"
@@ -81,10 +70,10 @@ msgid "Coda import"
 msgstr "Coda Uvoz"
 
 #. module: account_coda
-#: view:account.coda:0
-#: field:account.coda.import,note:0
-msgid "Log"
-msgstr "Zapisnik"
+#: code:addons/account_coda/account_coda.py:0
+#, python-format
+msgid "Coda file not found for bank statement !!"
+msgstr ""
 
 #. module: account_coda
 #: help:account.coda.import,awaiting_account:0
@@ -128,11 +117,6 @@ msgstr ""
 msgid "Coda Import Logs"
 msgstr ""
 
-#. module: account_coda
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neispravan XML za arhitekturu View-a !"
-
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
 msgid "coda for an Account"
@@ -158,6 +142,12 @@ msgstr ""
 msgid "Open Statements"
 msgstr ""
 
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:0
+#, python-format
+msgid "The bank account %s is not defined for the partner %s.\n"
+msgstr ""
+
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_import
 msgid "Import Coda Statements"
@@ -174,11 +164,6 @@ msgstr ""
 msgid "Statements"
 msgstr ""
 
-#. module: account_coda
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: account_coda
 #: field:account.bank.statement,coda_id:0
 msgid "Coda"
@@ -258,12 +243,6 @@ msgstr ""
 msgid "Coda Import"
 msgstr ""
 
-#. module: account_coda
-#: code:addons/account_coda/wizard/account_coda_import.py:0
-#, python-format
-msgid "The bank account %s is not defined for the partner %s.\n"
-msgstr ""
-
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,journal_id:0
@@ -273,9 +252,17 @@ msgstr ""
 #~ msgid "Clic on 'New' to select your file :"
 #~ msgstr "Kliknite na \"Novi\" za odabir datoteke"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta mora počinjati s x_ i ne smije sadržavati posebne znakove !"
+
 #~ msgid "_Open Statement"
 #~ msgstr "_Otvori izvod"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neispravan XML za arhitekturu View-a !"
+
 #~ msgid "Coda Statements"
 #~ msgstr "Coda stavke"
 
diff --git a/addons/account_coda/i18n/it.po b/addons/account_coda/i18n/it.po
index 38a7ca20df7..2a3369f76df 100644
--- a/addons/account_coda/i18n/it.po
+++ b/addons/account_coda/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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-21 07:55+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-22 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
@@ -24,17 +24,10 @@ msgid "Bank Journal"
 msgstr "Giornale Banca"
 
 #. module: account_coda
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
-
-#. module: account_coda
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome del modello non valido nella definizione dell'azione."
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Log"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda_import
@@ -61,11 +54,6 @@ msgstr ""
 msgid "Import Date"
 msgstr "Importa data"
 
-#. module: account_coda
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
 #. module: account_coda
 #: field:account.coda,note:0
 msgid "Import log"
@@ -81,17 +69,6 @@ msgstr "Importa"
 msgid "Coda import"
 msgstr "Importa CODA"
 
-#. module: account_coda
-#: view:account.coda:0
-#: field:account.coda.import,note:0
-msgid "Log"
-msgstr "Log"
-
-#. module: account_coda
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "L'ID certificato del modulo deve essere unico!"
-
 #. module: account_coda
 #: code:addons/account_coda/account_coda.py:0
 #, python-format
@@ -140,11 +117,6 @@ msgstr "Data"
 msgid "Coda Import Logs"
 msgstr ""
 
-#. module: account_coda
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzare l'architettura!"
-
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
 msgid "coda for an Account"
@@ -156,9 +128,9 @@ msgid "Default Payable Account"
 msgstr ""
 
 #. module: account_coda
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "La regola deve avere almeno un diritto di accesso spuntato!"
+#: help:account.coda,name:0
+msgid "Store the detail of bank statements"
+msgstr ""
 
 #. module: account_coda
 #: view:account.coda.import:0
@@ -170,11 +142,6 @@ msgstr "Annulla"
 msgid "Open Statements"
 msgstr ""
 
-#. module: account_coda
-#: help:account.coda,name:0
-msgid "Store the detail of bank statements"
-msgstr ""
-
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:0
 #, python-format
@@ -197,21 +164,11 @@ msgstr "Importa dichiarazione CODA"
 msgid "Statements"
 msgstr ""
 
-#. module: account_coda
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Le regole non sono supportate per gli oggetti: osv_memory!"
-
 #. module: account_coda
 #: field:account.bank.statement,coda_id:0
 msgid "Coda"
 msgstr "CODA"
 
-#. module: account_coda
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere unico!"
-
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Results :"
@@ -286,11 +243,6 @@ msgstr "Configura il Giornale e i conti:"
 msgid "Coda Import"
 msgstr ""
 
-#. module: account_coda
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,journal_id:0
@@ -300,15 +252,27 @@ msgstr ""
 #~ msgid "Clic on 'New' to select your file :"
 #~ msgstr "Clicca su \"Nuovo\" per selezionare il tuo file:"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
+
 #~ msgid "_Open Statement"
 #~ msgstr "_Apre Dichiarazione"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome del modello non valido nella definizione dell'azione."
+
 #~ msgid "Account CODA"
 #~ msgstr "Conto CODA"
 
 #~ msgid "Import Coda File"
 #~ msgstr "Importa file CODA"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per Visualizzare l'architettura!"
+
 #~ msgid ""
 #~ "Module provides functionality to import\n"
 #~ "    bank statements from .csv file.\n"
@@ -330,3 +294,18 @@ msgstr ""
 
 #~ msgid "Coda Statements"
 #~ msgstr "Dichiarazione CODA"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "L'ID certificato del modulo deve essere unico!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Le regole non sono supportate per gli oggetti: osv_memory!"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "La regola deve avere almeno un diritto di accesso spuntato!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Il nome del modulo deve essere unico!"
diff --git a/addons/account_coda/i18n/nl.po b/addons/account_coda/i18n/nl.po
index aadfc3c8a9d..397a0461eb3 100644
--- a/addons/account_coda/i18n/nl.po
+++ b/addons/account_coda/i18n/nl.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-04 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
diff --git a/addons/account_coda/i18n/pt.po b/addons/account_coda/i18n/pt.po
index 6be5a6bc0dd..b37890ae986 100644
--- a/addons/account_coda/i18n/pt.po
+++ b/addons/account_coda/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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
diff --git a/addons/account_coda/i18n/pt_BR.po b/addons/account_coda/i18n/pt_BR.po
index 8524cc5bed0..9ebe49127b7 100644
--- a/addons/account_coda/i18n/pt_BR.po
+++ b/addons/account_coda/i18n/pt_BR.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-12 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
diff --git a/addons/account_coda/i18n/ru.po b/addons/account_coda/i18n/ru.po
index aca5f8ca7d1..c01eb7ea8ce 100644
--- a/addons/account_coda/i18n/ru.po
+++ b/addons/account_coda/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-11-18 16:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-29 07:47+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-30 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
@@ -24,17 +24,10 @@ msgid "Bank Journal"
 msgstr "Банковский журнал"
 
 #. module: account_coda
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
-#. module: account_coda
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Журнал"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda_import
@@ -61,11 +54,6 @@ msgstr ""
 msgid "Import Date"
 msgstr "Импортировать дату"
 
-#. module: account_coda
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
 #. module: account_coda
 #: field:account.coda,note:0
 msgid "Import log"
@@ -81,17 +69,6 @@ msgstr "Импорт"
 msgid "Coda import"
 msgstr ""
 
-#. module: account_coda
-#: view:account.coda:0
-#: field:account.coda.import,note:0
-msgid "Log"
-msgstr "Журнал"
-
-#. module: account_coda
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
 #. module: account_coda
 #: code:addons/account_coda/account_coda.py:0
 #, python-format
@@ -140,11 +117,6 @@ msgstr "Дата"
 msgid "Coda Import Logs"
 msgstr ""
 
-#. module: account_coda
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра структуры!"
-
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
 msgid "coda for an Account"
@@ -156,9 +128,9 @@ msgid "Default Payable Account"
 msgstr ""
 
 #. module: account_coda
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "Правило должно иметь хотя бы одно проверенное право доступа !"
+#: help:account.coda,name:0
+msgid "Store the detail of bank statements"
+msgstr ""
 
 #. module: account_coda
 #: view:account.coda.import:0
@@ -170,11 +142,6 @@ msgstr "Отменить"
 msgid "Open Statements"
 msgstr ""
 
-#. module: account_coda
-#: help:account.coda,name:0
-msgid "Store the detail of bank statements"
-msgstr ""
-
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:0
 #, python-format
@@ -197,21 +164,11 @@ msgstr ""
 msgid "Statements"
 msgstr "Выписки"
 
-#. module: account_coda
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Правила не поддерживаются в объектах osv_memory !"
-
 #. module: account_coda
 #: field:account.bank.statement,coda_id:0
 msgid "Coda"
 msgstr ""
 
-#. module: account_coda
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Название модуля должно быть уникальным !"
-
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Results :"
@@ -286,19 +243,44 @@ msgstr ""
 msgid "Coda Import"
 msgstr ""
 
-#. module: account_coda
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Размер поля никогда не может быть меньше 1 !"
-
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,journal_id:0
 msgid "Journal"
 msgstr "Журнал"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Недопустимое имя модели в определении действия."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра структуры!"
+
 #~ msgid "_Close"
 #~ msgstr "_Закрыть"
 
 #~ msgid "_Ok"
 #~ msgstr "_Далее"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Правила не поддерживаются в объектах osv_memory !"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "Правило должно иметь хотя бы одно проверенное право доступа !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Название модуля должно быть уникальным !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Размер поля никогда не может быть меньше 1 !"
diff --git a/addons/account_coda/i18n/sr.po b/addons/account_coda/i18n/sr.po
index f47d1d4f3fd..bf35f61b62a 100644
--- a/addons/account_coda/i18n/sr.po
+++ b/addons/account_coda/i18n/sr.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-14 08:09+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-15 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
@@ -24,16 +24,10 @@ msgid "Bank Journal"
 msgstr "Dnevnik Banke"
 
 #. module: account_coda
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#. module: account_coda
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Pogrešno ime modela u definiciji akcije."
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Log"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda_import
@@ -60,11 +54,6 @@ msgstr "Podrazumevani Nalog za neprepoznati pokret"
 msgid "Import Date"
 msgstr "Uvezi Datum"
 
-#. module: account_coda
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
 #. module: account_coda
 #: field:account.coda,note:0
 msgid "Import log"
@@ -81,10 +70,10 @@ msgid "Coda import"
 msgstr "Coda Uvoz"
 
 #. module: account_coda
-#: view:account.coda:0
-#: field:account.coda.import,note:0
-msgid "Log"
-msgstr "Log"
+#: code:addons/account_coda/account_coda.py:0
+#, python-format
+msgid "Coda file not found for bank statement !!"
+msgstr ""
 
 #. module: account_coda
 #: help:account.coda.import,awaiting_account:0
@@ -132,11 +121,6 @@ msgstr "Datum"
 msgid "Coda Import Logs"
 msgstr "Logovi Uvoza Coda"
 
-#. module: account_coda
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za pregled arhitekture"
-
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
 msgid "coda for an Account"
@@ -162,6 +146,12 @@ msgstr "Otkazi"
 msgid "Open Statements"
 msgstr "Otvori Izvode"
 
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:0
+#, python-format
+msgid "The bank account %s is not defined for the partner %s.\n"
+msgstr "Nalog banke %s nije definisan za partnera %s.\n"
+
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_import
 msgid "Import Coda Statements"
@@ -178,11 +168,6 @@ msgstr "Uvezi Coda Stavku"
 msgid "Statements"
 msgstr "Izvodi"
 
-#. module: account_coda
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Pravila nisu podrzana od strane osv_memory objekta !"
-
 #. module: account_coda
 #: field:account.bank.statement,coda_id:0
 msgid "Coda"
@@ -264,12 +249,6 @@ msgstr "POdesi svoj Dnevnik i Nalog"
 msgid "Coda Import"
 msgstr "Coda Uvoz"
 
-#. module: account_coda
-#: code:addons/account_coda/wizard/account_coda_import.py:0
-#, python-format
-msgid "The bank account %s is not defined for the partner %s.\n"
-msgstr "Nalog banke %s nije definisan za partnera %s.\n"
-
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,journal_id:0
@@ -282,15 +261,26 @@ msgstr "Dnevnik"
 #~ msgid "_Open Statement"
 #~ msgstr "_Otvori izvod"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Pogrešno ime modela u definiciji akcije."
+
 #~ msgid "Account CODA"
 #~ msgstr "CODA Nalog"
 
 #~ msgid "Import Coda File"
 #~ msgstr "Uvezi Coda fajl"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
 #~ msgid "Coda Statements"
 #~ msgstr "Coda stavke"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nevažeći XML za pregled arhitekture"
+
 #~ msgid "Default receivable Account"
 #~ msgstr "Osnovni Konto Prihoda"
 
@@ -314,3 +304,9 @@ msgstr "Dnevnik"
 
 #~ msgid "Select your bank journal :"
 #~ msgstr "Izaberi svoj bancin dnevnik"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Pravila nisu podrzana od strane osv_memory objekta !"
diff --git a/addons/account_coda/i18n/sr@latin.po b/addons/account_coda/i18n/sr@latin.po
index fc17a5e1a18..da8bee21689 100644
--- a/addons/account_coda/i18n/sr@latin.po
+++ b/addons/account_coda/i18n/sr@latin.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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
diff --git a/addons/account_coda/i18n/sv.po b/addons/account_coda/i18n/sv.po
index a5a491e5d83..00d5bdfc012 100644
--- a/addons/account_coda/i18n/sv.po
+++ b/addons/account_coda/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-11-18 16:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-30 17:25+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-01 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
@@ -24,16 +24,10 @@ msgid "Bank Journal"
 msgstr "Bankjournal"
 
 #. module: account_coda
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#. module: account_coda
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Logg"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda_import
@@ -60,11 +54,6 @@ msgstr ""
 msgid "Import Date"
 msgstr ""
 
-#. module: account_coda
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fel! Ni kan inte skapa recursiva menyer"
-
 #. module: account_coda
 #: field:account.coda,note:0
 msgid "Import log"
@@ -80,17 +69,6 @@ msgstr "Importera"
 msgid "Coda import"
 msgstr "Coda Importera"
 
-#. module: account_coda
-#: view:account.coda:0
-#: field:account.coda.import,note:0
-msgid "Log"
-msgstr "Logg"
-
-#. module: account_coda
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Certifikat ID för modulen måste vara unik!"
-
 #. module: account_coda
 #: code:addons/account_coda/account_coda.py:0
 #, python-format
@@ -139,11 +117,6 @@ msgstr "Datum"
 msgid "Coda Import Logs"
 msgstr "Coda importloggar"
 
-#. module: account_coda
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ogiltig XML för Vy-arkitektur!"
-
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
 msgid "coda for an Account"
@@ -155,8 +128,8 @@ msgid "Default Payable Account"
 msgstr ""
 
 #. module: account_coda
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
+#: help:account.coda,name:0
+msgid "Store the detail of bank statements"
 msgstr ""
 
 #. module: account_coda
@@ -169,11 +142,6 @@ msgstr "Avbryt"
 msgid "Open Statements"
 msgstr ""
 
-#. module: account_coda
-#: help:account.coda,name:0
-msgid "Store the detail of bank statements"
-msgstr ""
-
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:0
 #, python-format
@@ -196,21 +164,11 @@ msgstr ""
 msgid "Statements"
 msgstr ""
 
-#. module: account_coda
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: account_coda
 #: field:account.bank.statement,coda_id:0
 msgid "Coda"
 msgstr "Coda"
 
-#. module: account_coda
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Namnet på modulen måste vara unikt!"
-
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Results :"
@@ -285,13 +243,28 @@ msgstr ""
 msgid "Coda Import"
 msgstr ""
 
-#. module: account_coda
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,journal_id:0
 msgid "Journal"
 msgstr ""
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fel! Ni kan inte skapa recursiva menyer"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Certifikat ID för modulen måste vara unik!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ogiltig XML för Vy-arkitektur!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Namnet på modulen måste vara unikt!"
diff --git a/addons/account_coda/i18n/zh_CN.po b/addons/account_coda/i18n/zh_CN.po
index 3cc0d18b5eb..6f21314c7e4 100644
--- a/addons/account_coda/i18n/zh_CN.po
+++ b/addons/account_coda/i18n/zh_CN.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-07-13 09:17+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\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-10-30 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
@@ -24,15 +24,10 @@ msgid "Bank Journal"
 msgstr "银行记录集合"
 
 #. module: account_coda
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
-
-#. module: account_coda
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "在动作定义使用了无效的模块名。"
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "日志"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda_import
@@ -59,11 +54,6 @@ msgstr ""
 msgid "Import Date"
 msgstr "导入日期"
 
-#. module: account_coda
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_coda
 #: field:account.coda,note:0
 msgid "Import log"
@@ -80,10 +70,10 @@ msgid "Coda import"
 msgstr "coda导入"
 
 #. module: account_coda
-#: view:account.coda:0
-#: field:account.coda.import,note:0
-msgid "Log"
-msgstr "日志"
+#: code:addons/account_coda/account_coda.py:0
+#, python-format
+msgid "Coda file not found for bank statement !!"
+msgstr ""
 
 #. module: account_coda
 #: help:account.coda.import,awaiting_account:0
@@ -127,11 +117,6 @@ msgstr ""
 msgid "Coda Import Logs"
 msgstr ""
 
-#. module: account_coda
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
-
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
 msgid "coda for an Account"
@@ -157,6 +142,12 @@ msgstr ""
 msgid "Open Statements"
 msgstr ""
 
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:0
+#, python-format
+msgid "The bank account %s is not defined for the partner %s.\n"
+msgstr ""
+
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_import
 msgid "Import Coda Statements"
@@ -173,11 +164,6 @@ msgstr "导入CODA"
 msgid "Statements"
 msgstr ""
 
-#. module: account_coda
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: account_coda
 #: field:account.bank.statement,coda_id:0
 msgid "Coda"
@@ -257,12 +243,6 @@ msgstr ""
 msgid "Coda Import"
 msgstr ""
 
-#. module: account_coda
-#: code:addons/account_coda/wizard/account_coda_import.py:0
-#, python-format
-msgid "The bank account %s is not defined for the partner %s.\n"
-msgstr ""
-
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,journal_id:0
@@ -272,12 +252,22 @@ msgstr ""
 #~ msgid "Clic on 'New' to select your file :"
 #~ msgstr "点击\"新\"去选择你的文件:"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+
 #~ msgid "_Open Statement"
 #~ msgstr "打开对帐单"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "在动作定义使用了无效的模块名。"
+
 #~ msgid "Account CODA"
 #~ msgstr "帐号 CODA"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效XML视图结构!"
+
 #~ msgid "Default receivable Account"
 #~ msgstr "默认应收帐款科目"
 
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/ar.po b/addons/account_followup/i18n/ar.po
index 90ae05887a9..590b2977bde 100644
--- a/addons/account_followup/i18n/ar.po
+++ b/addons/account_followup/i18n/ar.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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-10-30 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr ""
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr ""
 
@@ -61,6 +87,12 @@ msgstr ""
 msgid "Email Subject"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,8 +136,8 @@ msgid "Follow-Ups"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
 msgstr ""
 
 #. module: account_followup
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -123,6 +177,12 @@ msgstr ""
 msgid "Partners"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,8 +209,11 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
 msgstr ""
 
 #. module: account_followup
@@ -176,6 +239,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr ""
 
@@ -203,19 +267,15 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
 msgstr ""
 
 #. module: account_followup
@@ -237,6 +297,11 @@ msgstr ""
 msgid "Send followups"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -325,21 +387,11 @@ msgstr ""
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -380,11 +432,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -428,6 +498,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr ""
 
@@ -444,6 +515,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
@@ -457,14 +529,6 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -476,25 +540,14 @@ msgstr ""
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
 
 #. module: account_followup
@@ -562,6 +615,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr ""
 
@@ -575,6 +629,14 @@ msgstr ""
 msgid "Maturity"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -635,3 +697,8 @@ msgstr ""
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Up Criteria"
 msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/account_followup/i18n/bg.po b/addons/account_followup/i18n/bg.po
index ab41355a8e9..3978508bee0 100644
--- a/addons/account_followup/i18n/bg.po
+++ b/addons/account_followup/i18n/bg.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-09-08 12:28+0000\n"
 "Last-Translator: lem0na <nickyk@gmx.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-10-30 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr "Последвал отговор"
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Фирма"
 
@@ -61,6 +87,12 @@ msgstr ""
 msgid "Email Subject"
 msgstr "Тема"
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr "Легенда"
 msgid "Ok"
 msgstr ""
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,9 +136,9 @@ msgid "Follow-Ups"
 msgstr "Последвал отговори"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "ДДС:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "ДДС:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "Партньор"
 
@@ -123,6 +177,12 @@ msgstr ""
 msgid "Partners"
 msgstr "Партньори"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,9 +209,12 @@ msgid "Debit"
 msgstr "Дебит"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Тип сметка"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -176,6 +239,7 @@ msgstr "Ниво на следствие"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr "Последни следвания"
 
@@ -203,20 +267,16 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
-msgstr "Избор на партньори за напомняне"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -237,6 +297,11 @@ msgstr "Отпечатано съобщение"
 msgid "Send followups"
 msgstr "Изращане на следствие"
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -325,21 +387,11 @@ msgstr "Краен срок"
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -380,11 +432,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr "Изпращане на e-mail потвърждение"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -428,6 +498,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "Баланс"
 
@@ -444,6 +515,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Последно движение"
 
@@ -457,14 +529,6 @@ msgstr "Справка за следствие"
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -476,28 +540,15 @@ msgstr "Отказ"
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
-"Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-"символи!"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -564,6 +615,7 @@ msgstr "Име"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr "Първо движение"
 
@@ -577,6 +629,14 @@ msgstr "Ред"
 msgid "Maturity"
 msgstr "Падеж"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -638,18 +698,38 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #~ msgid "All payable entries"
 #~ msgstr "Всички платими записи"
 
 #~ msgid "Select partners"
 #~ msgstr "Избери партньори"
 
+#~ msgid "Account Type"
+#~ msgstr "Тип сметка"
+
 #~ msgid "%(line)s: Account Move lines"
 #~ msgstr "%(line)s: Редове на движение по сметка"
 
 #~ msgid "Follow-Ups Criteria"
 #~ msgstr "Критерия за следване"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Невалиден XML за преглед на архитектурата"
+
+#~ msgid "Select partners to remind"
+#~ msgstr "Избор на партньори за напомняне"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
+#~ "символи!"
+
 #~ msgid "All receivable entries"
 #~ msgstr "Всички приходни записи"
 
diff --git a/addons/account_followup/i18n/bs.po b/addons/account_followup/i18n/bs.po
index 82a8d8f2616..c0ad45c37bd 100644
--- a/addons/account_followup/i18n/bs.po
+++ b/addons/account_followup/i18n/bs.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-02 21:28+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr "Opomena"
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Poduzeće"
 
@@ -61,6 +87,12 @@ msgstr "Datum Fakture"
 msgid "Email Subject"
 msgstr "Predmet email-a"
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr "Legenda"
 msgid "Ok"
 msgstr "U redu"
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr "Datum slanja opomene"
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,9 +136,9 @@ msgid "Follow-Ups"
 msgstr "Opomene"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "PDV:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr "Opomena"
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "PDV:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
@@ -123,6 +177,12 @@ msgstr "Datum:"
 msgid "Partners"
 msgstr "Partneri"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,9 +209,12 @@ msgid "Debit"
 msgstr "Dugovanje"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Vrsta konta"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -176,6 +239,7 @@ msgstr "Stupanj opomene"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr "Poslijednja opomena"
 
@@ -203,20 +267,16 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
-msgstr "Odaberite partnere za opomenu"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -237,6 +297,11 @@ msgstr "Ispisana poruka"
 msgid "Send followups"
 msgstr "Pošaljite opomene"
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -325,21 +387,11 @@ msgstr "Dospijeva"
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "E-mail Postavke"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Neispravan naziv modela u definiciji zadatka."
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -380,11 +432,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr "Pošalji e-mail potvrdu"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -428,6 +498,7 @@ msgstr "%(company_currency)s: Valuta poduzeća korisnika"
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "Saldo"
 
@@ -444,6 +515,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Poslijenje knjiženje"
 
@@ -457,14 +529,6 @@ msgstr "Izvještaj o opomenama"
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -476,27 +540,15 @@ msgstr "Poništi"
 msgid "Follow-Up Lines"
 msgstr "Stavke opomene"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
-"Naziv Objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -563,6 +615,7 @@ msgstr "Naziv"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr "Prvo knjiženje"
 
@@ -576,6 +629,14 @@ msgstr ""
 msgid "Maturity"
 msgstr "Dospjelost"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -637,9 +698,25 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+
 #~ msgid "Select partners"
 #~ msgstr "Izabeeri partnere"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv Objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neispravan naziv modela u definiciji zadatka."
+
 #~ msgid "Amount In Currency"
 #~ msgstr "Iznos u valuti"
 
@@ -655,6 +732,9 @@ msgstr ""
 #~ msgid "Follow-up and Date Selection"
 #~ msgstr "Odabir datuma i opomene"
 
+#~ msgid "Select partners to remind"
+#~ msgstr "Odaberite partnere za opomenu"
+
 #~ msgid "Followup statistics"
 #~ msgstr "Statistike opomena"
 
@@ -771,5 +851,8 @@ msgstr ""
 #~ msgid "Print Follow Ups & Send Mails"
 #~ msgstr "Ispiši opomene i pošalji email-ove"
 
+#~ msgid "Account Type"
+#~ msgstr "Vrsta konta"
+
 #~ msgid "Lines"
 #~ msgstr "Stavke"
diff --git a/addons/account_followup/i18n/ca.po b/addons/account_followup/i18n/ca.po
index bef82619bba..b4bc51c9bf7 100644
--- a/addons/account_followup/i18n/ca.po
+++ b/addons/account_followup/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-10-30 13:46+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -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-10-31 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -28,6 +28,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -49,6 +74,7 @@ msgstr "Seguiment"
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Companyia"
 
@@ -62,6 +88,12 @@ msgstr "Data factura"
 msgid "Email Subject"
 msgstr "Assumpte correu electrònic"
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -73,11 +105,26 @@ msgstr "Llegenda"
 msgid "Ok"
 msgstr "D'acord"
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr "Data enviament del seguiment"
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -90,9 +137,9 @@ msgid "Follow-Ups"
 msgstr "Seguiments"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "CIF/NIF:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -110,7 +157,14 @@ msgid "Follow-up"
 msgstr "Seguiment"
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "CIF/NIF:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "Empresa"
 
@@ -124,6 +178,12 @@ msgstr "Data :"
 msgid "Partners"
 msgstr "Empreses"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -150,9 +210,12 @@ msgid "Debit"
 msgstr "Deure"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Tipus de compte"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -177,6 +240,7 @@ msgstr "Nivell seguiment"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr "Últim seguiment"
 
@@ -204,20 +268,16 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr "Envia correu en l'idioma de l'empresa"
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
-msgstr "Selecciona empreses per recordar"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -238,6 +298,11 @@ msgstr "Missatge imprès"
 msgid "Send followups"
 msgstr "Envia seguiments"
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -261,16 +326,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-"Tots els correus han estat enviats a les empreses correctament:.\n"
-"\n"
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -301,6 +356,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -330,21 +390,11 @@ msgstr "Degut"
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "Configuracions email"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de model no vàlid en la definició de l'acció."
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -385,11 +435,31 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr "Envia correu electrònic de confirmació"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+"Tots els correus han estat enviats a les empreses correctament:.\n"
+"\n"
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -433,6 +503,7 @@ msgstr "%(company_currency)s: Divisa de la companyia de l'usuari"
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "Saldo pendent"
 
@@ -449,6 +520,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Últim moviment"
 
@@ -462,17 +534,6 @@ msgstr "Informe de seguiments"
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-"Correu no enviat a les empreses següents, el seu email no estava "
-"disponible.\n"
-"\n"
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -484,32 +545,15 @@ msgstr "Cancel·la"
 msgid "Follow-Up Lines"
 msgstr "Línies de seguiment"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"Correu enviat a les següents empreses correctament.\n"
-"\n"
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
-"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-"especial!"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -576,6 +620,7 @@ msgstr "Nom"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr "Primer moviment"
 
@@ -589,6 +634,17 @@ msgstr "Li."
 msgid "Maturity"
 msgstr "Venciment"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+"Correu no enviat a les empreses següents, el seu email no estava "
+"disponible.\n"
+"\n"
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -650,18 +706,38 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #~ msgid "All payable entries"
 #~ msgstr "Tots els assentaments comptes a pagar"
 
 #~ msgid "Select partners"
 #~ msgstr "Selecciona empreses"
 
+#~ msgid "Account Type"
+#~ msgstr "Tipus de compte"
+
 #~ msgid "%(line)s: Account Move lines"
 #~ msgstr "%(line)s: Línies de moviments comptables"
 
 #~ msgid "Follow-Ups Criteria"
 #~ msgstr "Criteris de seguiments"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invàlid per a la definició de la vista!"
+
+#~ msgid "Select partners to remind"
+#~ msgstr "Selecciona empreses per recordar"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+#~ "especial!"
+
 #~ msgid "All receivable entries"
 #~ msgstr "Tots els assentaments comptes a cobrar"
 
@@ -785,5 +861,20 @@ msgstr ""
 #~ "Salutacions cordials,\n"
 #~ "\t\t\t"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom de model no vàlid en la definició de l'acció."
+
 #~ msgid "Print Follow Ups & Send Mails"
 #~ msgstr "Imprimeix seguiments i Envia correus"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "E-Mail sent to following Partners successfully. !\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Correu enviat a les següents empreses correctament.\n"
+#~ "\n"
diff --git a/addons/account_followup/i18n/cs.po b/addons/account_followup/i18n/cs.po
index 90ae05887a9..590b2977bde 100644
--- a/addons/account_followup/i18n/cs.po
+++ b/addons/account_followup/i18n/cs.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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-10-30 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr ""
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr ""
 
@@ -61,6 +87,12 @@ msgstr ""
 msgid "Email Subject"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,8 +136,8 @@ msgid "Follow-Ups"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
 msgstr ""
 
 #. module: account_followup
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -123,6 +177,12 @@ msgstr ""
 msgid "Partners"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,8 +209,11 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
 msgstr ""
 
 #. module: account_followup
@@ -176,6 +239,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr ""
 
@@ -203,19 +267,15 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
 msgstr ""
 
 #. module: account_followup
@@ -237,6 +297,11 @@ msgstr ""
 msgid "Send followups"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -325,21 +387,11 @@ msgstr ""
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -380,11 +432,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -428,6 +498,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr ""
 
@@ -444,6 +515,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
@@ -457,14 +529,6 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -476,25 +540,14 @@ msgstr ""
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
 
 #. module: account_followup
@@ -562,6 +615,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr ""
 
@@ -575,6 +629,14 @@ msgstr ""
 msgid "Maturity"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -635,3 +697,8 @@ msgstr ""
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Up Criteria"
 msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/account_followup/i18n/de.po b/addons/account_followup/i18n/de.po
index 7110c0090ff..52e6e353eba 100644
--- a/addons/account_followup/i18n/de.po
+++ b/addons/account_followup/i18n/de.po
@@ -6,7 +6,7 @@ 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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-30 12:28+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -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-01 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -134,11 +134,21 @@ msgstr "OK"
 msgid "Select Partners to Remind"
 msgstr "Wähle Partner für Zahlungserinnerung"
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr "Datum der Erinnerung"
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -213,11 +223,6 @@ msgstr "Ende Monat"
 msgid "Not Litigation"
 msgstr "Kein Verzug"
 
-#. module: account_followup
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(user_signature)s: User name"
@@ -250,11 +255,6 @@ msgid "Gives the sequence order when displaying a list of follow-up lines."
 msgstr ""
 "Zeigt die Reihenfolge bei der Anzeige einer Liste von Zahlungserinnerungen"
 
-#. module: account_followup
-#: 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 !"
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: field:account.followup.print.all,email_body:0
@@ -314,16 +314,17 @@ msgstr ""
 "\n"
 "Hochachtungsvoll,\n"
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr "Sende EMail in Sprache d. Partners"
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Partner Selection"
@@ -461,21 +462,11 @@ msgstr "Nächste Fälligkeit am:"
 msgid "Select Partners"
 msgstr "Wähle Partner"
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können kein rekursives Menü erstellen."
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "E-Mail-Einstellungen"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -516,6 +507,11 @@ msgstr "%(user_signature)s: Name Benutzer"
 msgid "Journal Items"
 msgstr "Journal Zeilen"
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
@@ -531,6 +527,11 @@ msgstr ""
 "Alle EMails wurden erfolgreich versendet an folgende Partner:\n"
 "\n"
 
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -616,11 +617,6 @@ msgstr "Abbrechen"
 msgid "Follow-Up Lines"
 msgstr "Zahlungserinnerung Zeilen"
 
-#. module: account_followup
-#: 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 !"
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
@@ -631,14 +627,6 @@ msgstr "In Verzug"
 msgid "Max Follow Up Level"
 msgstr "Max. Mahnstufe"
 
-#. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
 msgid "Payable Items"
@@ -792,6 +780,11 @@ msgstr "Letzte Aktualisierung"
 msgid "Follow-Up Criteria"
 msgstr "Zahlungserinnerung Kriterien"
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #~ msgid "All payable entries"
 #~ msgstr "Alle offenen Posten"
 
@@ -807,6 +800,15 @@ msgstr "Zahlungserinnerung Kriterien"
 #~ msgid "Follow-Ups Criteria"
 #~ msgstr "Zahlungserinnerungen Kriterien"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "All receivable entries"
 #~ msgstr "Alle Forderungspositionen"
 
@@ -936,6 +938,12 @@ msgstr "Zahlungserinnerung Kriterien"
 #~ msgid "Select partners to remind"
 #~ msgstr "Auswahl des Dateinamens für den Export"
 
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können kein rekursives Menü erstellen."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
 #, python-format
 #~ msgid ""
 #~ "\n"
@@ -947,3 +955,12 @@ msgstr "Zahlungserinnerung Kriterien"
 #~ "\n"
 #~ "Email, wurde erfolgreich an Partnern versendet.\n"
 #~ "\n"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/account_followup/i18n/el.po b/addons/account_followup/i18n/el.po
index c6a9612bf8d..10803764999 100644
--- a/addons/account_followup/i18n/el.po
+++ b/addons/account_followup/i18n/el.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"
-"PO-Revision-Date: 2010-11-15 10:07+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+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-11-16 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -26,6 +26,31 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Search Followup"
+msgstr "Αναζήτηση Επαλύθευσης"
+
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
 msgstr ""
 
 #. module: account_followup
@@ -49,6 +74,7 @@ msgstr "Follow-Up"
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Εταιρία"
 
@@ -62,6 +88,14 @@ msgstr "Ημερομηνία Τιμολογίου"
 msgid "Email Subject"
 msgstr "Θέμα Email"
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+"Επαλήθευσετε τις υπενθυμίσεις που έχουνε σταλεί στους συνεργάτες για "
+"απλήρωτα τιμολόγια"
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -73,11 +107,26 @@ msgstr "Υπόμνημα"
 msgid "Ok"
 msgstr "Ok"
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr "Επιλέξτε Συνεργάτες για Υπενθύμιση"
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr "Follow-up Sending Date"
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -90,9 +139,9 @@ msgid "Follow-Ups"
 msgstr "Follow-Ups"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "ΦΠΑ:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -110,7 +159,14 @@ msgid "Follow-up"
 msgstr "Follow-up"
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "ΦΠΑ:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "Συνεργάτης"
 
@@ -124,6 +180,12 @@ msgstr "Ημερομηνία :"
 msgid "Partners"
 msgstr "Συνεργάτες"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Υπενθύμιση Τιμολογίων"
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -150,9 +212,12 @@ msgid "Debit"
 msgstr "Χρέωση"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Τύπος Λογαριασμού"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -177,6 +242,7 @@ msgstr "Follow-up Level"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr "Latest followup"
 
@@ -204,20 +270,16 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr "Αποστολή Email στην Γλώσσα του Συνεργάτη"
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
-msgstr "Επιλογή συνεργατών για υπενθύμιση"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -238,6 +300,11 @@ msgstr "Εκτύπωση Μηνύματος"
 msgid "Send followups"
 msgstr "Send followups"
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -261,16 +328,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-"Όλα τα E-mails έχουν αποσταλεί στους Συνεργάτες:.\n"
-"\n"
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -301,6 +358,11 @@ msgstr "Αποστολή Αλληλογραφίας"
 msgid "Currency"
 msgstr "Νόμισμα"
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -330,21 +392,11 @@ msgstr "Έως"
 msgid "Select Partners"
 msgstr "Επιλογή Συνεργατών"
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Λάθος ! Δεν μπορείτε να δημιουργήσετε κενό Μενού"
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "Ρυθμίσεις Email"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -385,11 +437,31 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr "Αποστολή email επιβεβαίωσης"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+"Όλα τα E-mails έχουν αποσταλεί στους Συνεργάτες:.\n"
+"\n"
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -433,6 +505,7 @@ msgstr "%(company_currency)s: Νόμισμα Εταιρίας Χρήστη"
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "Ισοζύγιο"
 
@@ -449,6 +522,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Τελευταία κίνηση"
 
@@ -462,14 +536,6 @@ msgstr "Followup Report"
 msgid "Period"
 msgstr "Περίοδος"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -481,28 +547,15 @@ msgstr "Άκυρο"
 msgid "Follow-Up Lines"
 msgstr "Follow-Up Lines"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
-"Το όνομα του αντικειμένου θα πρέπει να ξεκινάει με x_ και να μην εμπεριέχει "
-"ειδικούς χαρακτήρες!"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -571,6 +624,7 @@ msgstr "Όνομα"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr "Πρώτη κίνηση"
 
@@ -584,6 +638,14 @@ msgstr "γρ."
 msgid "Maturity"
 msgstr "Ενηλικίωση"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -645,6 +707,11 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #~ msgid "Select partners"
 #~ msgstr "Επιλογή συνεργατών"
 
@@ -654,6 +721,9 @@ msgstr ""
 #~ msgid "Amount In Currency"
 #~ msgstr "Ποσό σε Νόμισμα"
 
+#~ msgid "Account Type"
+#~ msgstr "Τύπος Λογαριασμού"
+
 #, python-format
 #~ msgid ""
 #~ "\n"
@@ -681,6 +751,9 @@ msgstr ""
 #~ msgid "Follow-Ups Criteria"
 #~ msgstr "Follow-Ups Criteria"
 
+#~ msgid "Select partners to remind"
+#~ msgstr "Επιλογή συνεργατών για υπενθύμιση"
+
 #~ msgid ""
 #~ "\n"
 #~ "Dear %(partner_name)s,\n"
@@ -713,12 +786,21 @@ msgstr ""
 #~ msgid "Follow-up and Date Selection"
 #~ msgstr "Follow-up and Date Selection"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
+
 #~ msgid "All receivable entries"
 #~ msgstr "Όλες οι εισπρακτέες εγγραφές"
 
 #~ msgid "Lines"
 #~ msgstr "Γραμμές"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Το όνομα του αντικειμένου θα πρέπει να ξεκινάει με x_ και να μην εμπεριέχει "
+#~ "ειδικούς χαρακτήρες!"
+
 #~ msgid "Followup statistics"
 #~ msgstr "Followup statistics"
 
@@ -810,3 +892,9 @@ msgstr ""
 
 #~ msgid "Print Follow Ups & Send Mails"
 #~ msgstr "Εκτύπωση Follow Ups & Αποστολή Mail"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Λάθος ! Δεν μπορείτε να δημιουργήσετε κενό Μενού"
diff --git a/addons/account_followup/i18n/es.po b/addons/account_followup/i18n/es.po
index fca30f10946..96be203d38b 100644
--- a/addons/account_followup/i18n/es.po
+++ b/addons/account_followup/i18n/es.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-11 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/es_AR.po b/addons/account_followup/i18n/es_AR.po
index 02e21523354..e4f6f3a367b 100644
--- a/addons/account_followup/i18n/es_AR.po
+++ b/addons/account_followup/i18n/es_AR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-09-15 15:33+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.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-10-30 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr "Seguimiento"
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
@@ -61,6 +87,12 @@ msgstr "Fecha de factura"
 msgid "Email Subject"
 msgstr "Asunto del correo electrónico"
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr "Leyenda"
 msgid "Ok"
 msgstr "Aceptar"
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr "Fecha de envío del seguimiento"
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,9 +136,9 @@ msgid "Follow-Ups"
 msgstr "Seguimientos"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "IVA:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr "Seguimiento"
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "IVA:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
@@ -123,6 +177,12 @@ msgstr "Fecha :"
 msgid "Partners"
 msgstr "Partners"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,9 +209,12 @@ msgid "Debit"
 msgstr "Debe"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Tipo de Cuenta"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -176,6 +239,7 @@ msgstr "Seguimientos"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr "Último seguimiento"
 
@@ -203,20 +267,16 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista!"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
-msgstr "Seleccionar partners para recordar"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -237,6 +297,11 @@ msgstr "Mensaje impreso"
 msgid "Send followups"
 msgstr "Enviar seguimientos"
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -327,21 +389,11 @@ msgstr "Debe"
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "Configuraciones de email"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -382,11 +434,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr "Enviar correo electrónico de confirmación"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -430,6 +500,7 @@ msgstr "%(company_currency)s: Moneda de la compañía del usuario"
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "Saldo"
 
@@ -446,6 +517,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Último movimiento"
 
@@ -459,14 +531,6 @@ msgstr "Reporte de seguimiento"
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -478,28 +542,15 @@ msgstr "Cancelar"
 msgid "Follow-Up Lines"
 msgstr "Líneas de seguimiento"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
-"especial!"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -566,6 +617,7 @@ msgstr "Nombre"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr "Primer movimiento"
 
@@ -579,6 +631,14 @@ msgstr "Li."
 msgid "Maturity"
 msgstr "Vencimiento"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -640,6 +700,11 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #~ msgid "Lines"
 #~ msgstr "Líneas"
 
@@ -652,20 +717,35 @@ msgstr ""
 #~ msgid "Amount In Currency"
 #~ msgstr "Importe en moneda"
 
+#~ msgid "Account Type"
+#~ msgstr "Tipo de Cuenta"
+
 #~ msgid "%(line)s: Account Move lines"
 #~ msgstr "%(line)s: Líneas de movimientos de cuentas"
 
 #~ msgid "Follow-Ups Criteria"
 #~ msgstr "Criterios de seguimiento"
 
+#~ msgid "Select partners to remind"
+#~ msgstr "Seleccionar partners para recordar"
+
 #~ msgid "Follow-up and Date Selection"
 #~ msgstr "Selección fecha y seguimiento"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para la definición de la vista!"
+
 #~ msgid "Followup statistics"
 #~ msgstr "Estadísticas de seguimiento"
 
 #~ msgid "All receivable entries"
 #~ msgstr "Todos los asientos de cuentas a cobrar"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
+#~ "especial!"
+
 #~ msgid "Print Follow Ups & Send Mails"
 #~ msgstr "Imprimir seguimientos & Enviar correos"
diff --git a/addons/account_followup/i18n/es_EC.po b/addons/account_followup/i18n/es_EC.po
index 725b8e47d3e..9c47eb31b84 100644
--- a/addons/account_followup/i18n/es_EC.po
+++ b/addons/account_followup/i18n/es_EC.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-09-17 17:41+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -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-10-30 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -28,6 +28,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -49,6 +74,7 @@ msgstr "Seguimiento"
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
@@ -62,6 +88,12 @@ msgstr "Fecha factura"
 msgid "Email Subject"
 msgstr "Asunto correo electrónico"
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -73,11 +105,26 @@ msgstr "Leyenda"
 msgid "Ok"
 msgstr "Aceptar"
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr "Fecha envío del seguimiento"
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -90,9 +137,9 @@ msgid "Follow-Ups"
 msgstr "Seguimientos"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "CIF/NIF:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -110,7 +157,14 @@ msgid "Follow-up"
 msgstr "Seguimiento"
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "CIF/NIF:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "Empresa"
 
@@ -124,6 +178,12 @@ msgstr "Fecha :"
 msgid "Partners"
 msgstr "Empresas"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -150,9 +210,12 @@ msgid "Debit"
 msgstr "Debe"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Tipo de cuenta"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -177,6 +240,7 @@ msgstr "Nivel seguimiento"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr "Último seguimiento"
 
@@ -204,20 +268,16 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
-msgstr "Seleccionar empresas para recordar"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -238,6 +298,11 @@ msgstr "Mensaje impreso"
 msgid "Send followups"
 msgstr "Enviar seguimientos"
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -261,14 +326,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -299,6 +356,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -328,21 +390,11 @@ msgstr "Debido"
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "Configuración de correo electrónico"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -383,11 +435,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr "Enviar correo electrónico de confirmación"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -431,6 +501,7 @@ msgstr "%(company_currency)s: Divisa de la compañía del usuario"
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "Saldo pendiente"
 
@@ -447,6 +518,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Último movimiento"
 
@@ -460,14 +532,6 @@ msgstr "Informe de seguimientos"
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -479,28 +543,15 @@ msgstr "Cancelar"
 msgid "Follow-Up Lines"
 msgstr "Líneas de seguimiento"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -567,6 +618,7 @@ msgstr "Nombre"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr "Primer movimiento"
 
@@ -580,6 +632,14 @@ msgstr "Li."
 msgid "Maturity"
 msgstr "Vencimiento"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -640,3 +700,8 @@ msgstr ""
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Up Criteria"
 msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/account_followup/i18n/et.po b/addons/account_followup/i18n/et.po
index 34db5303c53..c6de157b6da 100644
--- a/addons/account_followup/i18n/et.po
+++ b/addons/account_followup/i18n/et.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-11-09 16:22+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-10-30 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr ""
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Firma"
 
@@ -61,6 +87,12 @@ msgstr "Arve kuupäev"
 msgid "Email Subject"
 msgstr "E-kirja teema"
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr "Legend"
 msgid "Ok"
 msgstr "Olgu"
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,9 +136,9 @@ msgid "Follow-Ups"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "Käibemaks:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "Käibemaks:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
@@ -123,6 +177,12 @@ msgstr "Kuupäev :"
 msgid "Partners"
 msgstr "Partnerid"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,9 +209,12 @@ msgid "Debit"
 msgstr "Deebet"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Konto tüüp"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -176,6 +239,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr ""
 
@@ -203,20 +267,16 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
-msgstr "Vali partnerid meeldetuletuseks"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -237,6 +297,11 @@ msgstr "Prinditud sõnum"
 msgid "Send followups"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -325,21 +387,11 @@ msgstr "Tähtaeg"
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "E-posti seadistused"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -380,11 +432,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr "Saada kinnituse e-kiri"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -428,6 +498,7 @@ msgstr "%(company_currency)s: Kasutaja ettevõtte valuuta"
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "Bilanss"
 
@@ -444,6 +515,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
@@ -457,14 +529,6 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -476,27 +540,15 @@ msgstr "Tühista"
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
-"Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -563,6 +615,7 @@ msgstr "Nimi"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr ""
 
@@ -576,6 +629,14 @@ msgstr ""
 msgid "Maturity"
 msgstr "Tähtaeg"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -637,11 +698,33 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #~ msgid "Select partners"
 #~ msgstr "Vali partnerid"
 
+#~ msgid "Account Type"
+#~ msgstr "Konto tüüp"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Vigane XML vaate arhitektuurile!"
+
+#~ 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 model name in the action definition."
+#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
+
 #~ msgid "Lines"
 #~ msgstr "Read"
 
 #~ msgid "Amount In Currency"
 #~ msgstr "Summa valuutas"
+
+#~ msgid "Select partners to remind"
+#~ msgstr "Vali partnerid meeldetuletuseks"
diff --git a/addons/account_followup/i18n/fi.po b/addons/account_followup/i18n/fi.po
index 7eb99da2c94..af4d89c4c71 100644
--- a/addons/account_followup/i18n/fi.po
+++ b/addons/account_followup/i18n/fi.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-02 21:31+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: Finnish <fi@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:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -28,6 +28,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -49,6 +74,7 @@ msgstr ""
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Yritys"
 
@@ -62,6 +88,12 @@ msgstr "Laskupäivä"
 msgid "Email Subject"
 msgstr "Sähköpostin aihe"
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -73,11 +105,26 @@ msgstr ""
 msgid "Ok"
 msgstr "OK"
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -90,8 +137,8 @@ msgid "Follow-Ups"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
 msgstr ""
 
 #. module: account_followup
@@ -110,7 +157,14 @@ msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "Kumppani"
 
@@ -124,6 +178,12 @@ msgstr "Päiväys"
 msgid "Partners"
 msgstr "Kumppanit"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -150,9 +210,12 @@ msgid "Debit"
 msgstr "Debet"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Tili tyyppi"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -177,6 +240,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr ""
 
@@ -204,20 +268,16 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Virheellinen XML näkymäarkkitehtuurille!"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
-msgstr "Valitse muitutettavat kumppanit"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -238,6 +298,11 @@ msgstr "Tulostettu viesti"
 msgid "Send followups"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -261,14 +326,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -299,6 +356,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -326,21 +388,11 @@ msgstr ""
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "Sähköpostin asetukset"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -381,11 +433,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr "Lähetä sähköpostivarmennus"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -429,6 +499,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "Saldo"
 
@@ -445,6 +516,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
@@ -458,14 +530,6 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -477,26 +541,15 @@ msgstr "Peruuta"
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
+msgstr ""
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -563,6 +616,7 @@ msgstr "Nimi"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr "Ensimmäinen liike"
 
@@ -576,6 +630,14 @@ msgstr ""
 msgid "Maturity"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -637,9 +699,17 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #~ msgid "Select partners"
 #~ msgstr "Valitse kumppanit"
 
+#~ msgid "Account Type"
+#~ msgstr "Tili tyyppi"
+
 #, python-format
 #~ msgid ""
 #~ "Mail not sent to following Partners, Email not available !\n"
@@ -649,5 +719,18 @@ msgstr ""
 #~ "saatavilla\n"
 #~ "\n"
 
+#~ msgid "Select partners to remind"
+#~ msgstr "Valitse muitutettavat kumppanit"
+
 #~ msgid "Lines"
 #~ msgstr "Rivit"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Virheellinen XML näkymäarkkitehtuurille!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
diff --git a/addons/account_followup/i18n/fr.po b/addons/account_followup/i18n/fr.po
index 54ff1486312..35789244677 100644
--- a/addons/account_followup/i18n/fr.po
+++ b/addons/account_followup/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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-02 21:32+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-10-30 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr "Suivis"
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Entreprise"
 
@@ -61,6 +87,12 @@ msgstr "Date de Facturation"
 msgid "Email Subject"
 msgstr "Sujet du Message"
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr "Légende"
 msgid "Ok"
 msgstr "Ok"
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr "Date d'envoi de la Relance"
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,9 +136,9 @@ msgid "Follow-Ups"
 msgstr "Relances"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "TVA :"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr "Relance"
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "TVA :"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "Partenaire"
 
@@ -123,6 +177,12 @@ msgstr "Date :"
 msgid "Partners"
 msgstr "Partenaires"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,9 +209,12 @@ msgid "Debit"
 msgstr "Débit"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Type de compte"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -176,6 +239,7 @@ msgstr "Dernier suivi"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr "Derniere relance"
 
@@ -203,20 +267,16 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
-msgstr "Sélectionnez les partenaires à prévenir"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -237,6 +297,11 @@ msgstr "Imprimer le Message"
 msgid "Send followups"
 msgstr "Envoyer relances"
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -326,21 +388,11 @@ msgstr "Dû"
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "Paramètres du Courriel"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom du Modèle non valide dans la définition de l'action."
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -381,11 +433,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr "Envoyer un Message de confirmation"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -429,6 +499,7 @@ msgstr "%(company_currency)s: Devise de la société de l'utilisateur"
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "Balance"
 
@@ -445,6 +516,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Dernier mouvement"
 
@@ -458,14 +530,6 @@ msgstr "Rapport des Relances"
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -477,28 +541,15 @@ msgstr "Annuler"
 msgid "Follow-Up Lines"
 msgstr "Lignes de Relances"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
-"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
-"spéciaux !"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -565,6 +616,7 @@ msgstr "Nom"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr "Premier mouvement"
 
@@ -578,6 +630,14 @@ msgstr "Lit."
 msgid "Maturity"
 msgstr "Échu"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -639,18 +699,38 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #~ msgid "All payable entries"
 #~ msgstr "Toutes les entrées payables"
 
 #~ msgid "Select partners"
 #~ msgstr "Sélectionnez les partenaires"
 
+#~ msgid "Account Type"
+#~ msgstr "Type de compte"
+
 #~ msgid "%(line)s: Account Move lines"
 #~ msgstr "%(line)s: lignes de Mouvement de Compte"
 
 #~ msgid "Follow-Ups Criteria"
 #~ msgstr "Critère de relance"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valide pour l'architecture de la vue"
+
+#~ msgid "Select partners to remind"
+#~ msgstr "Sélectionnez les partenaires à prévenir"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+#~ "spéciaux !"
+
 #~ msgid "All receivable entries"
 #~ msgstr "Toutes les entrées recevables"
 
@@ -660,6 +740,9 @@ msgstr ""
 #~ msgid "Followup statistics"
 #~ msgstr "Statistiques de rappel"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom du Modèle non valide dans la définition de l'action."
+
 #~ msgid "Amount In Currency"
 #~ msgstr "Montant en Devise"
 
diff --git a/addons/account_followup/i18n/hr.po b/addons/account_followup/i18n/hr.po
index b9cd29def7a..ab571d57269 100644
--- a/addons/account_followup/i18n/hr.po
+++ b/addons/account_followup/i18n/hr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-09-04 09:03+0000\n"
 "Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@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-10-30 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr ""
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Tvrtka"
 
@@ -61,6 +87,12 @@ msgstr "Datum Računa"
 msgid "Email Subject"
 msgstr "Predmet email-a"
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr ""
 msgid "Ok"
 msgstr "Ok"
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,9 +136,9 @@ msgid "Follow-Ups"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "VAT:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "VAT:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -123,6 +177,12 @@ msgstr "Datum :"
 msgid "Partners"
 msgstr "Partneri"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,9 +209,12 @@ msgid "Debit"
 msgstr "Dug"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Tip Računa"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -176,6 +239,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr ""
 
@@ -203,20 +267,16 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nepravilan XML format za Arhitekturu Prikaza!"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
-msgstr "Odaberite partnere za opomenu"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -237,6 +297,11 @@ msgstr "Ispisana Poruka"
 msgid "Send followups"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -325,21 +387,11 @@ msgstr "Dospijeće"
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "Email Postavke"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nepravilno ime modela u definiciji radnje."
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -380,11 +432,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -428,6 +498,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr ""
 
@@ -444,6 +515,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
@@ -457,14 +529,6 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -476,25 +540,14 @@ msgstr ""
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
 
 #. module: account_followup
@@ -562,6 +615,7 @@ msgstr "Ime"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr "Prvi potez"
 
@@ -575,6 +629,14 @@ msgstr "Li."
 msgid "Maturity"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -636,14 +698,31 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #~ msgid "Select partners"
 #~ msgstr "Odaberi partnere"
 
 #~ msgid "All payable entries"
 #~ msgstr "Sve stavke potraživanja"
 
+#~ msgid "Select partners to remind"
+#~ msgstr "Odaberite partnere za opomenu"
+
 #~ msgid "Lines"
 #~ msgstr "Linije"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nepravilno ime modela u definiciji radnje."
+
+#~ msgid "Account Type"
+#~ msgstr "Tip Računa"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nepravilan XML format za Arhitekturu Prikaza!"
+
 #~ msgid "Amount In Currency"
 #~ msgstr "Iznos u valuti"
diff --git a/addons/account_followup/i18n/hu.po b/addons/account_followup/i18n/hu.po
index 90ae05887a9..590b2977bde 100644
--- a/addons/account_followup/i18n/hu.po
+++ b/addons/account_followup/i18n/hu.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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-10-30 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr ""
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr ""
 
@@ -61,6 +87,12 @@ msgstr ""
 msgid "Email Subject"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,8 +136,8 @@ msgid "Follow-Ups"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
 msgstr ""
 
 #. module: account_followup
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -123,6 +177,12 @@ msgstr ""
 msgid "Partners"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,8 +209,11 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
 msgstr ""
 
 #. module: account_followup
@@ -176,6 +239,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr ""
 
@@ -203,19 +267,15 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
 msgstr ""
 
 #. module: account_followup
@@ -237,6 +297,11 @@ msgstr ""
 msgid "Send followups"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -325,21 +387,11 @@ msgstr ""
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -380,11 +432,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -428,6 +498,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr ""
 
@@ -444,6 +515,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
@@ -457,14 +529,6 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -476,25 +540,14 @@ msgstr ""
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
 
 #. module: account_followup
@@ -562,6 +615,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr ""
 
@@ -575,6 +629,14 @@ msgstr ""
 msgid "Maturity"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -635,3 +697,8 @@ msgstr ""
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Up Criteria"
 msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/account_followup/i18n/id.po b/addons/account_followup/i18n/id.po
index f1de060c236..3b05476e1ff 100644
--- a/addons/account_followup/i18n/id.po
+++ b/addons/account_followup/i18n/id.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-11-09 16:22+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-10-30 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr ""
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr ""
 
@@ -61,6 +87,12 @@ msgstr ""
 msgid "Email Subject"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,8 +136,8 @@ msgid "Follow-Ups"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
 msgstr ""
 
 #. module: account_followup
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -123,6 +177,12 @@ msgstr ""
 msgid "Partners"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,8 +209,11 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
 msgstr ""
 
 #. module: account_followup
@@ -176,6 +239,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr ""
 
@@ -203,19 +267,15 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
 msgstr ""
 
 #. module: account_followup
@@ -237,6 +297,11 @@ msgstr ""
 msgid "Send followups"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -325,21 +387,11 @@ msgstr ""
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -380,11 +432,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -428,6 +498,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr ""
 
@@ -444,6 +515,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
@@ -457,14 +529,6 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -476,25 +540,14 @@ msgstr ""
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
 
 #. module: account_followup
@@ -562,6 +615,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr ""
 
@@ -575,6 +629,14 @@ msgstr ""
 msgid "Maturity"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -635,3 +697,8 @@ msgstr ""
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Up Criteria"
 msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/account_followup/i18n/it.po b/addons/account_followup/i18n/it.po
index 1ca6cf64e2d..54625b0879b 100644
--- a/addons/account_followup/i18n/it.po
+++ b/addons/account_followup/i18n/it.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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-22 07:39+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-11-23 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -109,11 +109,21 @@ msgstr "Ok"
 msgid "Select Partners to Remind"
 msgstr "Seleziona i Partner a cui ricordare"
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr "Data invio Follow up"
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -188,11 +198,6 @@ msgstr "Fine mese"
 msgid "Not Litigation"
 msgstr ""
 
-#. module: account_followup
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere unico!"
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(user_signature)s: User name"
@@ -221,11 +226,6 @@ msgstr "Rif"
 msgid "Gives the sequence order when displaying a list of follow-up lines."
 msgstr ""
 
-#. module: account_followup
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: field:account.followup.print.all,email_body:0
@@ -267,16 +267,17 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Partner Selection"
@@ -386,21 +387,11 @@ msgstr "Dovuto"
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "Impostazioni E-mail"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome del modello non valido nella definizione dell'azione."
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -441,6 +432,11 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
@@ -454,6 +450,11 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -539,11 +540,6 @@ msgstr "Annulla"
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
@@ -554,14 +550,6 @@ msgstr ""
 msgid "Max Follow Up Level"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
 msgid "Payable Items"
@@ -710,6 +698,11 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #~ msgid "All payable entries"
 #~ msgstr "Tutte le voci pagabili"
 
@@ -722,5 +715,20 @@ msgstr ""
 #~ msgid "%(line)s: Account Move lines"
 #~ msgstr "%(line)s: linee movimenti"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per Visualizzazione Architettura!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
+
 #~ msgid "Lines"
 #~ msgstr "Righe"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome del modello non valido nella definizione dell'azione."
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Il nome del modulo deve essere unico!"
diff --git a/addons/account_followup/i18n/ko.po b/addons/account_followup/i18n/ko.po
index 92ab2ac47e5..451386b86e6 100644
--- a/addons/account_followup/i18n/ko.po
+++ b/addons/account_followup/i18n/ko.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-03 15:42+0000\n"
 "PO-Revision-Date: 2009-09-08 13:41+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-10-30 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -28,6 +28,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -49,6 +74,7 @@ msgstr ""
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "회사"
 
@@ -62,6 +88,12 @@ msgstr "인보이스 날짜"
 msgid "Email Subject"
 msgstr "이메일 주제"
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -73,11 +105,26 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -90,9 +137,9 @@ msgid "Follow-Ups"
 msgstr "Follow-Ups"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "VAT:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -110,7 +157,14 @@ msgid "Follow-up"
 msgstr "Follow-up"
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "VAT:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "파트너"
 
@@ -124,6 +178,12 @@ msgstr "날짜:"
 msgid "Partners"
 msgstr "파트너"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -150,9 +210,12 @@ msgid "Debit"
 msgstr "차변"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "계정 타입"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -177,6 +240,7 @@ msgstr "Follow-up 레벨"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr "최종 followup"
 
@@ -204,20 +268,16 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
-msgstr "상기시킬 파트너 선택"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -238,6 +298,11 @@ msgstr "인쇄된 메시지"
 msgid "Send followups"
 msgstr "followup 전송"
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -261,14 +326,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -299,6 +356,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -326,21 +388,11 @@ msgstr "시한"
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "이메일 설정"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -381,11 +433,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr "확인 이메일 보내기"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -429,6 +499,7 @@ msgstr "%(company_currency)s: 사용자의 회사/기관 계정"
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "밸런스"
 
@@ -445,6 +516,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "마지막 무브"
 
@@ -458,14 +530,6 @@ msgstr "Follow-Up 리포트"
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -477,26 +541,15 @@ msgstr "취소"
 msgid "Follow-Up Lines"
 msgstr "Follow-Up 라인"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함하면 안 됩니다 !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
+msgstr ""
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -563,6 +616,7 @@ msgstr "이름"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr "첫 이동"
 
@@ -576,6 +630,14 @@ msgstr ""
 msgid "Maturity"
 msgstr "만기"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -637,6 +699,11 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #~ msgid "Select partners"
 #~ msgstr "파트너 선택"
 
@@ -646,6 +713,9 @@ msgstr ""
 #~ msgid "Amount In Currency"
 #~ msgstr "금액"
 
+#~ msgid "Account Type"
+#~ msgstr "계정 타입"
+
 #, python-format
 #~ msgid ""
 #~ "\n"
@@ -672,6 +742,9 @@ msgstr ""
 #~ msgid "Follow-Ups Criteria"
 #~ msgstr "Follow-Up 범주"
 
+#~ msgid "Select partners to remind"
+#~ msgstr "상기시킬 파트너 선택"
+
 #~ msgid ""
 #~ "\n"
 #~ "Dear %(partner_name)s,\n"
@@ -785,3 +858,10 @@ msgstr ""
 
 #~ msgid "Print Follow Ups & Send Mails"
 #~ msgstr "Follow Ups 및 전송된 메일 인쇄"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함하면 안 됩니다 !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
diff --git a/addons/account_followup/i18n/lt.po b/addons/account_followup/i18n/lt.po
index 851a23d3d67..06e99f1baa2 100644
--- a/addons/account_followup/i18n/lt.po
+++ b/addons/account_followup/i18n/lt.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-09-09 07:09+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-10-30 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr ""
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Įmonė"
 
@@ -61,6 +87,12 @@ msgstr ""
 msgid "Email Subject"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr "Legenda"
 msgid "Ok"
 msgstr "Gerai"
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,9 +136,9 @@ msgid "Follow-Ups"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "PVM:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "PVM:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "Partneris"
 
@@ -123,6 +177,12 @@ msgstr ""
 msgid "Partners"
 msgstr "Partneriai"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,9 +209,12 @@ msgid "Debit"
 msgstr "Debetas"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Sąskaitos tipas"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -176,6 +239,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr ""
 
@@ -203,19 +267,15 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Netinkamas XML peržiūros architektūrai!"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
 msgstr ""
 
 #. module: account_followup
@@ -237,6 +297,11 @@ msgstr ""
 msgid "Send followups"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -325,21 +387,11 @@ msgstr ""
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -380,11 +432,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr "Nusiųsti elektroninio laiško formos patvirtinimą"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -428,6 +498,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "Likutis"
 
@@ -444,6 +515,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
@@ -457,14 +529,6 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -476,27 +540,15 @@ msgstr "Atšaukti"
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
-"Objekto pavadinimas turi prasidėti x_ ir neturėti jokių specialių simbolių!"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -563,6 +615,7 @@ msgstr "Pavadinimas"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr ""
 
@@ -576,6 +629,14 @@ msgstr ""
 msgid "Maturity"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -637,8 +698,24 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#~ msgid "Account Type"
+#~ msgstr "Sąskaitos tipas"
+
 #~ msgid "Lines"
 #~ msgstr "Eilutės"
 
 #~ msgid "Select partners"
 #~ msgstr "Pasirinkti partnerius"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objekto pavadinimas turi prasidėti x_ ir neturėti jokių specialių simbolių!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Netinkamas XML peržiūros architektūrai!"
diff --git a/addons/account_followup/i18n/mn.po b/addons/account_followup/i18n/mn.po
index 8559e54928c..6d232eff8ae 100644
--- a/addons/account_followup/i18n/mn.po
+++ b/addons/account_followup/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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-11 05:36+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:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -28,6 +28,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -49,6 +74,7 @@ msgstr ""
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Компани"
 
@@ -62,6 +88,12 @@ msgstr "Нэхэмжилсэн Огноо"
 msgid "Email Subject"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -73,11 +105,26 @@ msgstr "Тэмдэглэгээ"
 msgid "Ok"
 msgstr "Ok"
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -90,9 +137,9 @@ msgid "Follow-Ups"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "НӨАТ:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -110,7 +157,14 @@ msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "НӨАТ:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "Харилцагч"
 
@@ -124,6 +178,12 @@ msgstr "Огноо"
 msgid "Partners"
 msgstr "Харилцагч"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -150,9 +210,12 @@ msgid "Debit"
 msgstr "Дебит"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Дансны төрөл"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -177,6 +240,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr ""
 
@@ -204,19 +268,15 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Дэлгэцийн XML алдаатай!"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
 msgstr ""
 
 #. module: account_followup
@@ -238,6 +298,11 @@ msgstr ""
 msgid "Send followups"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -261,14 +326,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -299,6 +356,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -326,21 +388,11 @@ msgstr ""
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Үйлдэлийн тодорхойлолтод буруу моделийн нэр заасан байна."
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -381,11 +433,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -429,6 +499,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "Тэнцэл"
 
@@ -445,6 +516,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
@@ -458,14 +530,6 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -477,28 +541,15 @@ msgstr "Цуцлах"
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
-"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-"болохгүй!"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -565,6 +616,7 @@ msgstr "Нэр"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr ""
 
@@ -578,6 +630,14 @@ msgstr ""
 msgid "Maturity"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -639,5 +699,25 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Үйлдэлийн тодорхойлолтод буруу моделийн нэр заасан байна."
+
+#~ msgid "Account Type"
+#~ 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 "Lines"
 #~ msgstr "Мөрүүд"
diff --git a/addons/account_followup/i18n/nl.po b/addons/account_followup/i18n/nl.po
index 4a9e09e14dd..1caa121f4e6 100644
--- a/addons/account_followup/i18n/nl.po
+++ b/addons/account_followup/i18n/nl.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-04 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/nl_BE.po b/addons/account_followup/i18n/nl_BE.po
index 64b0ccf6c7e..9ca68eb2e61 100644
--- a/addons/account_followup/i18n/nl_BE.po
+++ b/addons/account_followup/i18n/nl_BE.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-02-03 14:34+0000\n"
 "Last-Translator: Niels Huylebroeck <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-10-30 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr ""
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Bedrijf"
 
@@ -61,6 +87,12 @@ msgstr ""
 msgid "Email Subject"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,8 +136,8 @@ msgid "Follow-Ups"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
 msgstr ""
 
 #. module: account_followup
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -123,6 +177,12 @@ msgstr ""
 msgid "Partners"
 msgstr "Relaties"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,9 +209,12 @@ msgid "Debit"
 msgstr "Debet"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Rekeningsoort"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -176,6 +239,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr ""
 
@@ -203,19 +267,15 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
 msgstr ""
 
 #. module: account_followup
@@ -237,6 +297,11 @@ msgstr ""
 msgid "Send followups"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -325,21 +387,11 @@ msgstr ""
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -380,11 +432,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -428,6 +498,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr ""
 
@@ -444,6 +515,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
@@ -457,14 +529,6 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -476,27 +540,15 @@ msgstr ""
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -563,6 +615,7 @@ msgstr "Naam:"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr ""
 
@@ -576,6 +629,14 @@ msgstr ""
 msgid "Maturity"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -637,8 +698,21 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #~ msgid "All payable entries"
 #~ msgstr "Alle crediteuren"
 
 #~ msgid "Select partners"
 #~ msgstr "Selecteer relaties"
+
+#~ msgid "Account Type"
+#~ msgstr "Rekeningsoort"
+
+#~ 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 karakters bevatten !"
diff --git a/addons/account_followup/i18n/oc.po b/addons/account_followup/i18n/oc.po
index 7c89e30dec3..f67b09a9e4c 100644
--- a/addons/account_followup/i18n/oc.po
+++ b/addons/account_followup/i18n/oc.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-02 21:37+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@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:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -28,6 +28,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -49,6 +74,7 @@ msgstr ""
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Entrepresa"
 
@@ -62,6 +88,12 @@ msgstr ""
 msgid "Email Subject"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -73,11 +105,26 @@ msgstr "Legenda"
 msgid "Ok"
 msgstr "D'acòrdi"
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -90,8 +137,8 @@ msgid "Follow-Ups"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
 msgstr ""
 
 #. module: account_followup
@@ -110,7 +157,14 @@ msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "Partenari"
 
@@ -124,6 +178,12 @@ msgstr "Data :"
 msgid "Partners"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -150,9 +210,12 @@ msgid "Debit"
 msgstr "Debit"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Tipe de compte"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -177,6 +240,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr ""
 
@@ -204,19 +268,15 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invalid per l'arquitectura de la vista"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
 msgstr ""
 
 #. module: account_followup
@@ -238,6 +298,11 @@ msgstr ""
 msgid "Send followups"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -261,14 +326,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -299,6 +356,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -326,21 +388,11 @@ msgstr "Tèrme"
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom del Modèl invalid per la definicion de l'accion."
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -381,11 +433,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -429,6 +499,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "Balança"
 
@@ -445,6 +516,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
@@ -458,14 +530,6 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -477,28 +541,15 @@ msgstr "Anullar"
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
-"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
-"especials !"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -565,6 +616,7 @@ msgstr "Nom"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr ""
 
@@ -578,6 +630,14 @@ msgstr "Lit."
 msgid "Maturity"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -639,5 +699,25 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#~ msgid "Account Type"
+#~ msgstr "Tipe de compte"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+#~ "especials !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invalid per l'arquitectura de la vista"
+
 #~ msgid "Lines"
 #~ msgstr "Linhas"
diff --git a/addons/account_followup/i18n/pl.po b/addons/account_followup/i18n/pl.po
index 13104e8e61b..dae5cb51abe 100644
--- a/addons/account_followup/i18n/pl.po
+++ b/addons/account_followup/i18n/pl.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-10-18 17:46+0000\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"
 "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-10-30 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr "Windykacja"
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Firma"
 
@@ -61,6 +87,12 @@ msgstr "Data faktury"
 msgid "Email Subject"
 msgstr "Temat wiadomości"
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr "Legenda"
 msgid "Ok"
 msgstr "Ok"
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr "Data wysłania wezwań"
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,9 +136,9 @@ msgid "Follow-Ups"
 msgstr "Wezwania"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "VAT:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr "Windykacja"
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "VAT:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
@@ -123,6 +177,12 @@ msgstr "Data :"
 msgid "Partners"
 msgstr "Partnerzy"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,9 +209,12 @@ msgid "Debit"
 msgstr "Winien"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Typ konta"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -176,6 +239,7 @@ msgstr "Poziom wezwania"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr "Ostatnia windykacja"
 
@@ -203,20 +267,16 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
-msgstr "Wybierz partnerów do wezwań"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -237,6 +297,11 @@ msgstr "Wydrukowana wiadomość"
 msgid "Send followups"
 msgstr "Wyślij wezwania"
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -325,21 +387,11 @@ msgstr "Termin"
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "Ustawienia e-maila"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -380,11 +432,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr "Wyślij potwierdzenie emaila"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -428,6 +498,7 @@ msgstr "%(company_currency)s: Waluta firmy użytkownika"
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "Saldo"
 
@@ -444,6 +515,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Ostatnia zmiana"
 
@@ -457,14 +529,6 @@ msgstr "Raport windykacji"
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -476,28 +540,15 @@ msgstr "Anuluj"
 msgid "Follow-Up Lines"
 msgstr "Pozycje windykacji"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
-"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-"specjalnych !"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -564,6 +615,7 @@ msgstr "Nazwa"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr "Pierwsza zmiana"
 
@@ -577,6 +629,14 @@ msgstr ""
 msgid "Maturity"
 msgstr "Termin płatności"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -638,6 +698,20 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#~ 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 "Select partners"
 #~ msgstr "Wybierz partnerów"
 
@@ -650,6 +724,9 @@ msgstr ""
 #~ msgid "All payable entries"
 #~ msgstr "Wszystkie zapisy zobowiązań"
 
+#~ msgid "Account Type"
+#~ msgstr "Typ konta"
+
 #~ msgid "%(line)s: Account Move lines"
 #~ msgstr "%(line)s: Pozycje zmian stanu konta"
 
@@ -659,6 +736,9 @@ msgstr ""
 #~ msgid "Follow-up and Date Selection"
 #~ msgstr "Wybór windykacji i daty"
 
+#~ msgid "Select partners to remind"
+#~ msgstr "Wybierz partnerów do wezwań"
+
 #~ msgid "Follow-Ups Criteria"
 #~ msgstr "Kryteria windykacji"
 
@@ -774,3 +854,6 @@ msgstr ""
 #~ "\n"
 #~ "Pozdrawiamy,\n"
 #~ "\t\t\t"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
diff --git a/addons/account_followup/i18n/pt.po b/addons/account_followup/i18n/pt.po
index 6a08d343025..a1eb5088d5c 100644
--- a/addons/account_followup/i18n/pt.po
+++ b/addons/account_followup/i18n/pt.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-08-02 21:37+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\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-10-30 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr "Dar Seguimento"
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Empresa"
 
@@ -61,6 +87,12 @@ msgstr "Data da Factura"
 msgid "Email Subject"
 msgstr "Assunto do E-mail"
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,10 +104,25 @@ msgstr "Legenda"
 msgid "Ok"
 msgstr "Ok"
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
-msgstr "Seguimento da data de envio"
+msgstr "Seguimento da Data de Envio"
+
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
@@ -89,19 +136,19 @@ msgid "Follow-Ups"
 msgstr "Seguimentos"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "IVA:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Total debit"
-msgstr "Debito total"
+msgstr "Débito total"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(heading)s: Move line header"
-msgstr "%(heading)s: Mover linha de cabeçalho"
+msgstr "%(heading)s: Mover linha do cabeçalho"
 
 #. module: account_followup
 #: field:account.followup.print,followup_id:0
@@ -109,9 +156,16 @@ msgid "Follow-up"
 msgstr "Seguimento"
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "IVA:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
-msgstr "Parceiro"
+msgstr "Terceiro"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -121,7 +175,13 @@ msgstr "Data :"
 #. module: account_followup
 #: field:account.followup.print.all,partner_ids:0
 msgid "Partners"
-msgstr "Parceiros"
+msgstr "Terceiros"
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
@@ -131,7 +191,7 @@ msgstr ""
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "End of Month"
-msgstr "Fim do mês"
+msgstr "Fim do Mês"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -149,14 +209,17 @@ msgid "Debit"
 msgstr "Débito"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Tipo de Conta"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Ref"
-msgstr "Ref"
+msgstr "Referência"
 
 #. module: account_followup
 #: help:account_followup.followup.line,sequence:0
@@ -167,15 +230,16 @@ msgstr ""
 #: view:account.followup.print.all:0
 #: field:account.followup.print.all,email_body:0
 msgid "Email body"
-msgstr "Corpo do e-mail"
+msgstr "Corpo do E-mail"
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 msgid "Follow-up Level"
-msgstr "Nivel de seguimento"
+msgstr "Nível de Seguimento"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr "Últimos Seguimentos"
 
@@ -203,30 +267,26 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura de vista"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
-msgstr "Seleccionar parceiros para lembrar"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Partner Selection"
-msgstr "Selecção de Parceiros"
+msgstr "Seleção de Terceiro"
 
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
-msgstr "Mensagem impressa"
+msgstr "Mensagem Impressa"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -237,6 +297,11 @@ msgstr "Mensagem impressa"
 msgid "Send followups"
 msgstr "Enviar seguimentos"
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,10 +355,15 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
-msgstr "Gestão do seguimento da conta"
+msgstr "Gestão do seguimento da contabilidade"
 
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
@@ -313,13 +375,13 @@ msgstr ""
 msgid ""
 "This field allow you to select a forecast date to plan your follow-ups"
 msgstr ""
-"Este campo permite-lhe a selecção de uma data para programar os seus "
+"Este campo permite-lhe a selecção de uma data para planejar os seus "
 "seguimentos"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Due"
-msgstr "Devido"
+msgstr "Divída"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:0
@@ -327,21 +389,11 @@ msgstr "Devido"
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "Parâmetros de Email"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo invalido na definição da acção"
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -360,7 +412,7 @@ msgstr "Sub-Total:"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Balance:"
-msgstr "Balanço:"
+msgstr "Saldo:"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
@@ -382,15 +434,33 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
-msgstr "Enviar confirmação de e-mail"
+msgstr "Enviar E-mail de confirmação"
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
-msgstr "%(company_name)s: Nome da empresa do utilizador"
+msgstr "%(company_name)s: Nome da Empresa do Utilizador"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_res_company
@@ -420,23 +490,24 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow-Up lines"
-msgstr "Linhas de seguimento"
+msgstr "Linhas de Seguimento"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_currency)s: User's Company Currency"
-msgstr "%(company_currency)s: Divisa da Companhia do Utilizador"
+msgstr "%(company_currency)s: Moeda da Empresa do Utilizador"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
-msgstr "Saldo"
+msgstr "Balancete"
 
 #. module: account_followup
 #: field:account_followup.followup.line,start:0
 msgid "Type of Term"
-msgstr "Tipo de termo"
+msgstr "Tipo de Termos"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
@@ -446,27 +517,20 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Último movimento"
 
 #. module: account_followup
 #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
 msgid "Followup Report"
-msgstr "Relatório de seguimento"
+msgstr "Relatório de Seguimento"
 
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -478,27 +542,15 @@ msgstr "Cancelar"
 msgid "Follow-Up Lines"
 msgstr "Linhas de Seguimento"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -508,13 +560,13 @@ msgstr ""
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(followup_amount)s: Total Amount Due"
-msgstr "%(followup_amount)s: Quantidade total devido"
+msgstr "%(followup_amount)s: Montante total devido"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
 msgid "%(date)s: Current Date"
-msgstr "%(date)s: Data actual"
+msgstr "%(date)s: Data Actual"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -536,7 +588,7 @@ msgstr ""
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Partner entries"
-msgstr "Entradas de parceiros"
+msgstr "Movimentos do Terceiro"
 
 #. module: account_followup
 #: help:account.followup.print.all,partner_lang:0
@@ -565,6 +617,7 @@ msgstr "Nome"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr "Primeiro movimento"
 
@@ -578,6 +631,14 @@ msgstr "Li."
 msgid "Maturity"
 msgstr "Maturidade"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -591,7 +652,7 @@ msgstr "Dias de atraso"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
-msgstr "Documento: Declaração da conta do cliente"
+msgstr "Documento: Extrato da conta do cliente"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -602,7 +663,7 @@ msgstr "Resumo"
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Total credit"
-msgstr "Credito total"
+msgstr "Crédito Total"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -622,12 +683,12 @@ msgstr ""
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Customer Ref :"
-msgstr "Ref. do Cliente:"
+msgstr "Referência do Cliente:"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(partner_name)s: Partner name"
-msgstr "%(partner_name)s: Nome do terceiro"
+msgstr "%(partner_name)s: Nome do Terceiro"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -639,140 +700,16 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
-#~ msgid "Follow-Ups Criteria"
-#~ msgstr "Critérios de seguimento"
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
 
-#~ msgid "All receivable entries"
-#~ msgstr "Todas as entradas recebidas"
+#~ msgid "Account Type"
+#~ msgstr "Tipo de Conta"
 
 #~ msgid "Lines"
 #~ msgstr "Linhas"
 
-#~ msgid "Followup statistics"
-#~ msgstr "Estatísticas de seguimentos"
-
-#~ msgid "Amount In Currency"
-#~ msgstr "Montante em Numerário"
-
 #~ msgid "All payable entries"
 #~ msgstr "Todos os movimentos a pagar"
-
-#~ msgid "Select partners"
-#~ msgstr "Seleccionar Parceiros"
-
-#~ msgid "%(line)s: Account Move lines"
-#~ msgstr "%(line)s: Linhas de movimento de contas"
-
-#~ msgid ""
-#~ "\n"
-#~ "Dear %(partner_name)s,\n"
-#~ "\n"
-#~ "Exception made if there was a mistake of ours, it seems that the following "
-#~ "amount staid unpaid. Please, take appropriate measures in order to carry out "
-#~ "this payment in the next 8 days.\n"
-#~ "\n"
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "department at (+32).10.68.94.39.\n"
-#~ "\n"
-#~ "Best Regards,\n"
-#~ "\t\t\t"
-#~ msgstr ""
-#~ "\n"
-#~ "Caro %(partner_name)s,\n"
-#~ "\n"
-#~ "À excepção feita se houver um erro nosso, parece que o seguinte montante "
-#~ "ainda está por pagar. Por favor, tome as medidas adequadas a fim de efectuar "
-#~ "esse pagamento nos próximos oito dias.\n"
-#~ "\n"
-#~ "Se o seu pagamento tiver sido realizado após este e-mail ter sido enviado, "
-#~ "por favor, considere o presente como nulos. Não hesite em entrar em contato "
-#~ "com nosso departamento de contabilidade (+32) .10.68.94.39.\n"
-#~ "\n"
-#~ "Atenciosamente,\n"
-#~ "\t\t\t"
-
-#~ msgid "Follow-up and Date Selection"
-#~ msgstr "Seguimento e Selecção da Data"
-
-#~ msgid ""
-#~ "\n"
-#~ "Dear %(partner_name)s,\n"
-#~ "\n"
-#~ "We are disappointed to see that despite sending a reminder, that your "
-#~ "account is now seriously overdue.\n"
-#~ "\n"
-#~ "It is essential that immediate payment is made, otherwise we will have to "
-#~ "consider placing a stop on your account which means that we will no longer "
-#~ "be able to supply your company with (goods/services).\n"
-#~ "Please, take appropriate measures in order to carry out this payment in the "
-#~ "next 8 days\n"
-#~ "\n"
-#~ "If there is a problem with paying invoice that we are not aware of, do not "
-#~ "hesitate to contact our accounting department at (+32).10.68.94.39. so that "
-#~ "we can resolve the matter quickly.\n"
-#~ "\n"
-#~ "Details of due payments is printed below.\n"
-#~ "\n"
-#~ "Best Regards,\n"
-#~ "\t\t\t"
-#~ msgstr ""
-#~ "\n"
-#~ "Caro %(partner_name)s,\n"
-#~ "\n"
-#~ "Estamos desapontados em ver que apesar de o envio de um lembrete de que sua "
-#~ "conta está seriamente atrasada.\n"
-#~ "\n"
-#~ "É essencial que o pagamento seja feito, caso contrário, teremos que "
-#~ "considerar um stop em sua conta o que significa que não seremos mais capazes "
-#~ "de fornecer à sua empresa (produtos/serviços).\n"
-#~ "Por favor, tome as medidas adequadas a fim de efectuar esse pagamento nos "
-#~ "próximos 8 dias.\n"
-#~ "\n"
-#~ "Se houver um problema com o pagamento da factura que não temos conhecimento "
-#~ "de, não hesite em entrar em contato com o nosso departamento de "
-#~ "contabilidade (+32) .10.68.94.39. para que possamos resolver a questão "
-#~ "rapidamente.\n"
-#~ "\n"
-#~ "Detalhes dos pagamentos devidos é impresso abaixo.\n"
-#~ "\n"
-#~ "Atenciosamente,\n"
-#~ "\t\t\t"
-
-#~ msgid ""
-#~ "\n"
-#~ "Dear %(partner_name)s,\n"
-#~ "\n"
-#~ "Despite several reminders, your account is still not settled.\n"
-#~ "\n"
-#~ "Unless full payment is made in next 8 days , then legal action for the "
-#~ "recovery of the debt, will be taken without further notice.\n"
-#~ "\n"
-#~ "I trust that this action will prove unnecessary and details of due payments "
-#~ "is printed below.\n"
-#~ "\n"
-#~ "In case of any queries concerning this matter, do not hesitate to contact "
-#~ "our accounting department at (+32).10.68.94.39.\n"
-#~ "\n"
-#~ "Best Regards,\n"
-#~ "\t\t\t"
-#~ msgstr ""
-#~ "\n"
-#~ "Caro %(partner_name)s,\n"
-#~ "\n"
-#~ "Apesar de várias insistências, a conta ainda não está resolvida.\n"
-#~ "\n"
-#~ "A não ser que o pagamento integral seja feita nos próximos oito dias, então "
-#~ "a ação legal para a cobrança da dívida, será tomada sem aviso prévio.\n"
-#~ "\n"
-#~ "Espero que não seja necessário tomar essa medida, os detalhes de pagamentos "
-#~ "estão impressos abaixo.\n"
-#~ "\n"
-#~ "Em caso de quaisquer dúvidas sobre esta questão, não hesite em entrar em "
-#~ "contato com nosso departamento de contabilidade (+32) .10.68.94.39.\n"
-#~ "\n"
-#~ "Atenciosamente,\n"
-#~ "\t\t\t"
-
-#~ msgid "Print Follow Ups & Send Mails"
-#~ msgstr "Imprimir Segmentos e Enviar Mensagens"
diff --git a/addons/account_followup/i18n/pt_BR.po b/addons/account_followup/i18n/pt_BR.po
index 78df717c751..80bb4820332 100644
--- a/addons/account_followup/i18n/pt_BR.po
+++ b/addons/account_followup/i18n/pt_BR.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-09-08 12:37+0000\n"
 "Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.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-10-30 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr ""
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr ""
 
@@ -61,6 +87,12 @@ msgstr ""
 msgid "Email Subject"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,8 +136,8 @@ msgid "Follow-Ups"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
 msgstr ""
 
 #. module: account_followup
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -123,6 +177,12 @@ msgstr ""
 msgid "Partners"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,8 +209,11 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
 msgstr ""
 
 #. module: account_followup
@@ -176,6 +239,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr ""
 
@@ -203,19 +267,15 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
 msgstr ""
 
 #. module: account_followup
@@ -237,6 +297,11 @@ msgstr ""
 msgid "Send followups"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -325,21 +387,11 @@ msgstr ""
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -380,11 +432,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -428,6 +498,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr ""
 
@@ -444,6 +515,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
@@ -457,14 +529,6 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -476,28 +540,15 @@ msgstr ""
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
-"O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-"especial!"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -564,6 +615,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr ""
 
@@ -577,6 +629,14 @@ msgstr ""
 msgid "Maturity"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -637,3 +697,17 @@ msgstr ""
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Up Criteria"
 msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalido XML para Arquitetura da View"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
+#~ "especial!"
diff --git a/addons/account_followup/i18n/ro.po b/addons/account_followup/i18n/ro.po
index 80ec20ebdd4..32f258b59d9 100644
--- a/addons/account_followup/i18n/ro.po
+++ b/addons/account_followup/i18n/ro.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-02 21:37+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-10-30 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr "Urmare"
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Companie"
 
@@ -61,6 +87,12 @@ msgstr "Data facturii"
 msgid "Email Subject"
 msgstr "Subiect e-mail"
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr "Legendă"
 msgid "Ok"
 msgstr "Ok"
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr "Data trimiterii urmării"
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,9 +136,9 @@ msgid "Follow-Ups"
 msgstr "Urmăriri"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "TVA:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr "Urmărire"
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "TVA:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "Partener"
 
@@ -123,6 +177,12 @@ msgstr "Data :"
 msgid "Partners"
 msgstr "Parteneri"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,9 +209,12 @@ msgid "Debit"
 msgstr "Debit"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Tip cont"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -176,6 +239,7 @@ msgstr "Nivel urmare"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr "Ultima urmare"
 
@@ -203,20 +267,16 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invalid pentru arhitectura machetei de afișare !"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
-msgstr "Selectare parteneri de atenţionat"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -237,6 +297,11 @@ msgstr "Mesaj tiparit"
 msgid "Send followups"
 msgstr "Trimitere urmări"
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -327,21 +389,11 @@ msgstr "Scadență"
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "Configurari e-mail"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nume invalid de model în definirea acţiunii"
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -382,11 +434,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr "Trimite e-mail de confirmare"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -430,6 +500,7 @@ msgstr "%(company_currency)s: Moneda companiei utilizatorului"
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "Sold"
 
@@ -446,6 +517,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Ultima mişcare"
 
@@ -459,14 +531,6 @@ msgstr "Raport urmăriri"
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -478,28 +542,15 @@ msgstr "Anulare"
 msgid "Follow-Up Lines"
 msgstr "Linii urmări"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
-"Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
-"special !"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -566,6 +617,7 @@ msgstr "Nume"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr "Prima mişcare"
 
@@ -579,6 +631,14 @@ msgstr "Li."
 msgid "Maturity"
 msgstr "Termen"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -640,6 +700,14 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#~ msgid "Account Type"
+#~ msgstr "Tip cont"
+
 #~ msgid "Lines"
 #~ msgstr "Linii"
 
@@ -672,6 +740,9 @@ msgstr ""
 #~ "Cu stimă,\n"
 #~ "\t\t\t"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nume invalid de model în definirea acţiunii"
+
 #~ msgid "All payable entries"
 #~ msgstr "Toate înregistrările de plătit"
 
@@ -687,9 +758,21 @@ msgstr ""
 #~ msgid "Follow-Ups Criteria"
 #~ msgstr "Criterii urmare"
 
+#~ msgid "Select partners to remind"
+#~ msgstr "Selectare parteneri de atenţionat"
+
 #~ msgid "Follow-up and Date Selection"
 #~ msgstr "Selecţie dată şi urmare"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invalid pentru arhitectura machetei de afișare !"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
+#~ "special !"
+
 #~ msgid "All receivable entries"
 #~ msgstr "Toate înregistrările de încasat"
 
diff --git a/addons/account_followup/i18n/ru.po b/addons/account_followup/i18n/ru.po
index 05aeea841a7..336ac87dff7 100644
--- a/addons/account_followup/i18n/ru.po
+++ b/addons/account_followup/i18n/ru.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-10-18 17:46+0000\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"
 "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-10-30 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr "Дальнейшие действия"
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Компания"
 
@@ -61,6 +87,12 @@ msgstr "Дата счета-фактуры"
 msgid "Email Subject"
 msgstr "Тема эл.письма"
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr "Описание"
 msgid "Ok"
 msgstr "Ок"
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,9 +136,9 @@ msgid "Follow-Ups"
 msgstr "Дальнейшие действия"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "НДС:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "НДС:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "Партнер"
 
@@ -123,6 +177,12 @@ msgstr "Дата :"
 msgid "Partners"
 msgstr "Партнеры"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,9 +209,12 @@ msgid "Debit"
 msgstr "Дебет"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Тип счета"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -176,6 +239,7 @@ msgstr "Уровень дальнейших действий"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr "Последние дальнейшие действия"
 
@@ -203,20 +267,16 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
-msgstr "Выберите партнеров для напоминания"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -237,6 +297,11 @@ msgstr "Напечатанное сообщение"
 msgid "Send followups"
 msgstr "Отправить дальнейшие действия"
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -325,21 +387,11 @@ msgstr "Срок"
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "Параметры эл. почты"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -380,11 +432,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr "Отправить подтверждение по эл.почте"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -428,6 +498,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "Баланс"
 
@@ -444,6 +515,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
@@ -457,14 +529,6 @@ msgstr "Отчет о дальнейших действиях"
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -476,28 +540,15 @@ msgstr "Отменить"
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -564,6 +615,7 @@ msgstr "Название"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr ""
 
@@ -577,6 +629,14 @@ msgstr ""
 msgid "Maturity"
 msgstr "Срок платежа"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -638,17 +698,40 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #~ msgid "All payable entries"
 #~ msgstr "Все проводки к оплате"
 
 #~ msgid "Select partners"
 #~ msgstr "Выберите партнеров"
 
+#~ msgid "Account Type"
+#~ msgstr "Тип счета"
+
 #~ msgid "Follow-Ups Criteria"
 #~ msgstr "Критерии дальнейших действий"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра архитектуры!"
+
+#~ msgid "Select partners to remind"
+#~ msgstr "Выберите партнеров для напоминания"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
+
 #~ msgid "Followup statistics"
 #~ msgstr "Статистика дальнейших действий"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Недопустимое имя модели в определении действия."
+
 #~ msgid "Lines"
 #~ msgstr "Линии"
diff --git a/addons/account_followup/i18n/sl.po b/addons/account_followup/i18n/sl.po
index 1745b6bf3c8..9ab8480393f 100644
--- a/addons/account_followup/i18n/sl.po
+++ b/addons/account_followup/i18n/sl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-11-17 09: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-10-30 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr "Navezava"
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Družba"
 
@@ -61,6 +87,12 @@ msgstr "Datum računa"
 msgid "Email Subject"
 msgstr "Predmet e-pošte"
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr "Legenda"
 msgid "Ok"
 msgstr "V redu"
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,9 +136,9 @@ msgid "Follow-Ups"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "DDV:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "DDV:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
@@ -123,6 +177,12 @@ msgstr "Datum:"
 msgid "Partners"
 msgstr "Partnerji"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,9 +209,12 @@ msgid "Debit"
 msgstr "V breme"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Vrsta konta"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -176,6 +239,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr ""
 
@@ -203,20 +267,16 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
-msgstr "Izberite partnerje za opomin"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -237,6 +297,11 @@ msgstr "Izpisano sporočilo"
 msgid "Send followups"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -325,21 +387,11 @@ msgstr "Zapade"
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "Nastavitve e-pošte"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Napačno ime modela v definiciji dejanja."
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -380,11 +432,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr "Pošlji potrditev po e-pošti"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -428,6 +498,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "Stanje"
 
@@ -444,6 +515,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Zadnji premik"
 
@@ -457,14 +529,6 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -476,27 +540,15 @@ msgstr "Prekliči"
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -563,6 +615,7 @@ msgstr "Ime"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr "Prvi premik"
 
@@ -576,6 +629,14 @@ msgstr ""
 msgid "Maturity"
 msgstr "Zapadlost"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -637,9 +698,28 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
+
+#~ msgid "Account Type"
+#~ msgstr "Vrsta konta"
+
 #~ msgid "Lines"
 #~ msgstr "Črte"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Napačno ime modela v definiciji dejanja."
+
 #~ msgid "Select partners"
 #~ msgstr "Izberi partnerje"
 
@@ -651,3 +731,6 @@ msgstr ""
 
 #~ msgid "All payable entries"
 #~ msgstr "Vsi zapisi obveznosti"
+
+#~ msgid "Select partners to remind"
+#~ msgstr "Izberite partnerje za opomin"
diff --git a/addons/account_followup/i18n/sq.po b/addons/account_followup/i18n/sq.po
index 3fa569785b3..c0c8cace4ab 100644
--- a/addons/account_followup/i18n/sq.po
+++ b/addons/account_followup/i18n/sq.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-02 14:41+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -28,6 +28,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -49,6 +74,7 @@ msgstr ""
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr ""
 
@@ -62,6 +88,12 @@ msgstr ""
 msgid "Email Subject"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -73,11 +105,26 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -90,8 +137,8 @@ msgid "Follow-Ups"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
 msgstr ""
 
 #. module: account_followup
@@ -110,7 +157,14 @@ msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -124,6 +178,12 @@ msgstr ""
 msgid "Partners"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -150,8 +210,11 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
 msgstr ""
 
 #. module: account_followup
@@ -177,6 +240,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr ""
 
@@ -204,19 +268,15 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
 msgstr ""
 
 #. module: account_followup
@@ -238,6 +298,11 @@ msgstr ""
 msgid "Send followups"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -261,14 +326,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -299,6 +356,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -326,21 +388,11 @@ msgstr ""
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -381,11 +433,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -429,6 +499,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr ""
 
@@ -445,6 +516,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
@@ -458,14 +530,6 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -477,25 +541,14 @@ msgstr ""
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
 
 #. module: account_followup
@@ -563,6 +616,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr ""
 
@@ -576,6 +630,14 @@ msgstr ""
 msgid "Maturity"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -636,3 +698,8 @@ msgstr ""
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Up Criteria"
 msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/account_followup/i18n/sr.po b/addons/account_followup/i18n/sr.po
index 53cf19dca59..5d22a2ae49b 100644
--- a/addons/account_followup/i18n/sr.po
+++ b/addons/account_followup/i18n/sr.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-10-27 08:03+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-10-30 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -28,6 +28,31 @@ msgstr "Sumarno Pracenje"
 msgid "Search Followup"
 msgstr "Pretrazi Pracenja"
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -49,6 +74,7 @@ msgstr "Следи"
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Preduzeće"
 
@@ -62,6 +88,12 @@ msgstr "Datum računa"
 msgid "Email Subject"
 msgstr "Tema Email-a"
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -73,11 +105,26 @@ msgstr "Legenda"
 msgid "Ok"
 msgstr "U redu"
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr "Datum Slanja Pracenja"
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -90,9 +137,9 @@ msgid "Follow-Ups"
 msgstr "Pracenja"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "PDV:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -110,7 +157,14 @@ msgid "Follow-up"
 msgstr "Pracenje"
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "PDV:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
@@ -124,6 +178,12 @@ msgstr "Datum :"
 msgid "Partners"
 msgstr "Partneri"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -150,9 +210,12 @@ msgid "Debit"
 msgstr "Duguje"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Vrsta konta"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -177,6 +240,7 @@ msgstr "Nivo praćenja"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr "Poslednje praćenje"
 
@@ -222,20 +286,16 @@ msgstr ""
 "\n"
 "Uz svo postovanje.\n"
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za pregled arhitekture"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr "Posalji Email na jeziku Partnera"
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
-msgstr "Odaberite partnere za opomenu"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -256,6 +316,11 @@ msgstr "Ispisana Poruka"
 msgid "Send followups"
 msgstr "Pošalji praćenja"
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -291,16 +356,6 @@ msgstr ""
 "\n"
 "Svo Postovanje.\n"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-"Svi Email-ovi su uspeno poslati vasim partnerima:.\n"
-"\n"
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -346,6 +401,11 @@ msgstr "Slanje Emailova"
 msgid "Currency"
 msgstr "Valuta"
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -375,21 +435,11 @@ msgstr "Dospeće"
 msgid "Select Partners"
 msgstr "Selektuj Partnere"
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "Email Postavke"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Pogrešno ime modela u definiciji akcije."
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -430,11 +480,31 @@ msgstr "%(user_signature): Korisnicko Ime"
 msgid "Journal Items"
 msgstr "Sadrzaj Dnevnika"
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr "Pošalji Email potvrdu"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+"Svi Email-ovi su uspeno poslati vasim partnerima:.\n"
+"\n"
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -478,6 +548,7 @@ msgstr "%(company_currency)s: Valuta Preduzeca Korisnika"
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "Saldo"
 
@@ -494,6 +565,7 @@ msgstr "Stampaj Pracenje & Posalji Emailove Strankama"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Poslednji potez"
 
@@ -507,16 +579,6 @@ msgstr "Izvestaj Pracenja"
 msgid "Period"
 msgstr "Razdoblje"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-"E-mail NIJE poslat sledecim Partnerima, Email nije dostupan !\n"
-"\n"
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -528,31 +590,15 @@ msgstr "Otkaži"
 msgid "Follow-Up Lines"
 msgstr "Redovi Praćenja"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"E-mail je USPESNO prosledjen sledecim Partnerima. !\n"
-"\n"
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr "Sporno"
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
-"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -621,6 +667,7 @@ msgstr "Ime"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr "Prvi potez"
 
@@ -634,6 +681,16 @@ msgstr "Li."
 msgid "Maturity"
 msgstr "Dospeće"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+"E-mail NIJE poslat sledecim Partnerima, Email nije dostupan !\n"
+"\n"
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -695,6 +752,14 @@ msgstr "Datum poslednjeg Pracenja"
 msgid "Follow-Up Criteria"
 msgstr "Kriterijum Pracenja"
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Pogrešno ime modela u definiciji akcije."
+
 #~ msgid "All payable entries"
 #~ msgstr "Sve stavke potraživanja"
 
@@ -704,12 +769,18 @@ msgstr "Kriterijum Pracenja"
 #~ msgid "Select partners"
 #~ msgstr "Odaberi partnere"
 
+#~ msgid "Account Type"
+#~ msgstr "Vrsta konta"
+
 #~ msgid "%(line)s: Account Move lines"
 #~ msgstr "%(red): redovi prenosa računa"
 
 #~ msgid "Follow-Ups Criteria"
 #~ msgstr "Kriterijumi Praćenja"
 
+#~ msgid "Select partners to remind"
+#~ msgstr "Odaberite partnere za opomenu"
+
 #~ msgid ""
 #~ "\n"
 #~ "Dear %(partner_name)s,\n"
@@ -742,6 +813,14 @@ msgstr "Kriterijum Pracenja"
 #~ msgid "Follow-up and Date Selection"
 #~ msgstr "Praćenja i Datum Selekcije"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nevažeći XML za pregled arhitekture"
+
 #~ msgid "Lines"
 #~ msgstr "redova"
 
@@ -832,3 +911,18 @@ msgstr "Kriterijum Pracenja"
 
 #~ msgid "Print Follow Ups & Send Mails"
 #~ msgstr "Odstampaj Pracenja & Posalji Meilove"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "E-Mail sent to following Partners successfully. !\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "E-mail je USPESNO prosledjen sledecim Partnerima. !\n"
+#~ "\n"
diff --git a/addons/account_followup/i18n/sr@latin.po b/addons/account_followup/i18n/sr@latin.po
index 75e379a4805..4acde2a04ee 100644
--- a/addons/account_followup/i18n/sr@latin.po
+++ b/addons/account_followup/i18n/sr@latin.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-11 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/sv.po b/addons/account_followup/i18n/sv.po
index b496d0a59db..c2174997c17 100644
--- a/addons/account_followup/i18n/sv.po
+++ b/addons/account_followup/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-11 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/tlh.po b/addons/account_followup/i18n/tlh.po
index 4d7d227fda0..a3c1f1a084f 100644
--- a/addons/account_followup/i18n/tlh.po
+++ b/addons/account_followup/i18n/tlh.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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-10-30 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr ""
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr ""
 
@@ -61,6 +87,12 @@ msgstr ""
 msgid "Email Subject"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,8 +136,8 @@ msgid "Follow-Ups"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
 msgstr ""
 
 #. module: account_followup
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -123,6 +177,12 @@ msgstr ""
 msgid "Partners"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,8 +209,11 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
 msgstr ""
 
 #. module: account_followup
@@ -176,6 +239,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr ""
 
@@ -203,19 +267,15 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
 msgstr ""
 
 #. module: account_followup
@@ -237,6 +297,11 @@ msgstr ""
 msgid "Send followups"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -325,21 +387,11 @@ msgstr ""
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -380,11 +432,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -428,6 +498,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr ""
 
@@ -444,6 +515,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
@@ -457,14 +529,6 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -476,25 +540,14 @@ msgstr ""
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
 
 #. module: account_followup
@@ -562,6 +615,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr ""
 
@@ -575,6 +629,14 @@ msgstr ""
 msgid "Maturity"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -635,3 +697,8 @@ msgstr ""
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Up Criteria"
 msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po
index e2a6f4e91ad..9384792abb9 100644
--- a/addons/account_followup/i18n/tr.po
+++ b/addons/account_followup/i18n/tr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-10-30 15:46+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-10-31 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr "İş Takipçisi"
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Firma"
 
@@ -61,6 +87,12 @@ msgstr "Fatura Tarihi"
 msgid "Email Subject"
 msgstr "E-Mail Konusu"
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr "Açıklama"
 msgid "Ok"
 msgstr ""
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr "İş Takibi Gönderim Tarihi"
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,9 +136,9 @@ msgid "Follow-Ups"
 msgstr "İş Takipçisi"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "KDV :"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr "Takip"
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "KDV :"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "Ortak"
 
@@ -123,6 +177,12 @@ msgstr ""
 msgid "Partners"
 msgstr "Cari Kartlar"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,9 +209,12 @@ msgid "Debit"
 msgstr "Borç"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Hesap Tipi"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -176,6 +239,7 @@ msgstr "Takip Seviyesi"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr "Son İş Takibi"
 
@@ -203,20 +267,16 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr "E-Maili Carinin Dilinde Gönder"
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
-msgstr "Hatırlatma Yapılacak Carileri Seçiniz..."
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -237,6 +297,11 @@ msgstr ""
 msgid "Send followups"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -325,21 +387,11 @@ msgstr "Vade"
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "E-mail Ayarları"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -380,11 +432,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr "Email Onayı gönder"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -428,6 +498,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "Bakiye"
 
@@ -444,6 +515,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
@@ -457,14 +529,6 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -476,25 +540,14 @@ msgstr "İptal"
 msgid "Follow-Up Lines"
 msgstr "İş Takipçisi Ögeleri"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
 
 #. module: account_followup
@@ -562,6 +615,7 @@ msgstr "Adı"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr ""
 
@@ -575,6 +629,14 @@ msgstr ""
 msgid "Maturity"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -636,12 +698,23 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
+
 #~ msgid "All payable entries"
 #~ msgstr "Tüm Ödenecek Kayıtlar"
 
 #~ msgid "Select partners"
 #~ msgstr "Carileri Seçiniz..."
 
+#~ msgid "Account Type"
+#~ msgstr "Hesap Tipi"
+
 #~ msgid "%(line)s: Account Move lines"
 #~ msgstr "%(line)s: Hesap Hareket Kalemleri"
 
@@ -651,6 +724,9 @@ msgstr ""
 #~ msgid "Follow-up and Date Selection"
 #~ msgstr "İş Takibi ve Tarih Seçimi"
 
+#~ msgid "Select partners to remind"
+#~ msgstr "Hatırlatma Yapılacak Carileri Seçiniz..."
+
 #~ msgid "All receivable entries"
 #~ msgstr "Tüm Alacak Kayıtları"
 
diff --git a/addons/account_followup/i18n/uk.po b/addons/account_followup/i18n/uk.po
index 39f3eace768..bc3afd31ede 100644
--- a/addons/account_followup/i18n/uk.po
+++ b/addons/account_followup/i18n/uk.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-02-03 06:38+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-10-30 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr "Послідовність дій"
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "Компанія"
 
@@ -61,6 +87,12 @@ msgstr ""
 msgid "Email Subject"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,9 +136,9 @@ msgid "Follow-Ups"
 msgstr "Контроль виконання"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "ПДВ:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "ПДВ:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "Партнер"
 
@@ -123,6 +177,12 @@ msgstr ""
 msgid "Partners"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,9 +209,12 @@ msgid "Debit"
 msgstr "Дебет"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Тип рахунку"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -176,6 +239,7 @@ msgstr "Рівень послідовності дій"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr "Остання послідовність дій"
 
@@ -203,19 +267,15 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури Вигляду!"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
 msgstr ""
 
 #. module: account_followup
@@ -237,6 +297,11 @@ msgstr ""
 msgid "Send followups"
 msgstr "Надіслати послідовності дій"
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -325,21 +387,11 @@ msgstr "Борг"
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -380,11 +432,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -428,6 +498,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "Сальдо"
 
@@ -444,6 +515,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "Остання дія"
 
@@ -457,14 +529,6 @@ msgstr "Звіт про виконання"
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -476,27 +540,15 @@ msgstr "Скасувати"
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
-"Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -563,6 +615,7 @@ msgstr "Назва"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr "Перша дія"
 
@@ -576,6 +629,14 @@ msgstr ""
 msgid "Maturity"
 msgstr "Готовність"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -637,12 +698,28 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #~ msgid "All payable entries"
 #~ msgstr "Всі кредиторські записи"
 
+#~ msgid "Account Type"
+#~ msgstr "Тип рахунку"
+
 #~ msgid "Follow-Ups Criteria"
 #~ msgstr "Критерії послідовностей дій"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильний XML для Архітектури Вигляду!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
+
 #~ msgid "Lines"
 #~ msgstr "Рядки"
 
diff --git a/addons/account_followup/i18n/vi.po b/addons/account_followup/i18n/vi.po
index 239e3f11f66..aa994288921 100644
--- a/addons/account_followup/i18n/vi.po
+++ b/addons/account_followup/i18n/vi.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-02 14:41+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-10-30 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -28,6 +28,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -49,6 +74,7 @@ msgstr ""
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr ""
 
@@ -62,6 +88,12 @@ msgstr ""
 msgid "Email Subject"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -73,11 +105,26 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -90,8 +137,8 @@ msgid "Follow-Ups"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
 msgstr ""
 
 #. module: account_followup
@@ -110,7 +157,14 @@ msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -124,6 +178,12 @@ msgstr ""
 msgid "Partners"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -150,8 +210,11 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
 msgstr ""
 
 #. module: account_followup
@@ -177,6 +240,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr ""
 
@@ -204,19 +268,15 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
 msgstr ""
 
 #. module: account_followup
@@ -238,6 +298,11 @@ msgstr ""
 msgid "Send followups"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -261,14 +326,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -299,6 +356,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -326,21 +388,11 @@ msgstr ""
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -381,11 +433,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -429,6 +499,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr ""
 
@@ -445,6 +516,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
@@ -458,14 +530,6 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -477,25 +541,14 @@ msgstr ""
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
 
 #. module: account_followup
@@ -563,6 +616,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr ""
 
@@ -576,6 +630,14 @@ msgstr ""
 msgid "Maturity"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -636,3 +698,8 @@ msgstr ""
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Up Criteria"
 msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/account_followup/i18n/zh_CN.po b/addons/account_followup/i18n/zh_CN.po
index 73fa0360dd4..0718a41e51c 100644
--- a/addons/account_followup/i18n/zh_CN.po
+++ b/addons/account_followup/i18n/zh_CN.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-09-29 10:27+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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-10-30 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr "跟进"
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr "公司"
 
@@ -61,6 +87,12 @@ msgstr "发票日期"
 msgid "Email Subject"
 msgstr "电子邮件主题"
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr "图表"
 msgid "Ok"
 msgstr "确定"
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr "跟进发送日期"
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,9 +136,9 @@ msgid "Follow-Ups"
 msgstr "跟进"
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "增值税:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr "跟进"
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "增值税:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr "业务伙伴"
 
@@ -123,6 +177,12 @@ msgstr "日期:"
 msgid "Partners"
 msgstr "业务伙伴"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,9 +209,12 @@ msgid "Debit"
 msgstr "借方"
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "科目类型"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -176,6 +239,7 @@ msgstr "跟进等级"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr "最近跟进"
 
@@ -203,20 +267,16 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
-msgstr "给业务伙伴一个提醒电子邮件"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -237,6 +297,11 @@ msgstr "已打印消息"
 msgid "Send followups"
 msgstr "发送跟进"
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -325,21 +387,11 @@ msgstr "应付款"
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "电子邮件设置"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "在动作定义使用了无效的模式名称。"
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -380,11 +432,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr "确认发送电子邮件"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -428,6 +498,7 @@ msgstr "当前用户公司:%(company_currency)s"
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr "余额"
 
@@ -444,6 +515,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr "最后"
 
@@ -457,14 +529,6 @@ msgstr "跟进报表"
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -476,26 +540,15 @@ msgstr "取消"
 msgid "Follow-Up Lines"
 msgstr "跟进明细"
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
+msgstr ""
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -562,6 +615,7 @@ msgstr "名称"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr "首先"
 
@@ -575,6 +629,14 @@ msgstr "Li."
 msgid "Maturity"
 msgstr "到期日期"
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -636,12 +698,20 @@ msgstr ""
 msgid "Follow-Up Criteria"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #~ msgid "Amount In Currency"
 #~ msgstr "金额"
 
 #~ msgid "Select partners"
 #~ msgstr "选择业务伙伴"
 
+#~ msgid "Account Type"
+#~ msgstr "科目类型"
+
 #~ msgid ""
 #~ "\n"
 #~ "    Modules to automate letters for unpaid invoices, with multi-level "
@@ -689,6 +759,9 @@ msgstr ""
 #~ msgid "Follow-up and Date Selection"
 #~ msgstr "跟进和日期选择"
 
+#~ msgid "Select partners to remind"
+#~ msgstr "给业务伙伴一个提醒电子邮件"
+
 #~ msgid ""
 #~ "\n"
 #~ "Dear %(partner_name)s,\n"
@@ -755,6 +828,13 @@ msgstr ""
 #~ msgid "Print Follow Ups & Send Mails"
 #~ 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 "All payable entries"
 #~ msgstr "所有应付款"
 
@@ -791,3 +871,6 @@ msgstr ""
 #~ "                                                                             "
 #~ "                 商祺\n"
 #~ "\t\t\t"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "在动作定义使用了无效的模式名称。"
diff --git a/addons/account_followup/i18n/zh_TW.po b/addons/account_followup/i18n/zh_TW.po
index 1702bfc4c05..8a163342877 100644
--- a/addons/account_followup/i18n/zh_TW.po
+++ b/addons/account_followup/i18n/zh_TW.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-01-30 12:43+0000\n"
 "Last-Translator: <>\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-10-30 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -27,6 +27,31 @@ msgstr ""
 msgid "Search Followup"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
@@ -48,6 +73,7 @@ msgstr ""
 #: field:account_followup.followup,company_id:0
 #: view:account_followup.stat:0
 #: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
 msgstr ""
 
@@ -61,6 +87,12 @@ msgstr ""
 msgid "Email Subject"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
@@ -72,11 +104,26 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -89,8 +136,8 @@ msgid "Follow-Ups"
 msgstr ""
 
 #. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
 msgstr ""
 
 #. module: account_followup
@@ -109,7 +156,14 @@ msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -123,6 +177,12 @@ msgstr ""
 msgid "Partners"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
@@ -149,8 +209,11 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
 msgstr ""
 
 #. module: account_followup
@@ -176,6 +239,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
 msgstr ""
 
@@ -203,19 +267,15 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr ""
 
 #. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select partners to remind"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
 msgstr ""
 
 #. module: account_followup
@@ -237,6 +297,11 @@ msgstr ""
 msgid "Send followups"
 msgstr ""
 
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
@@ -260,14 +325,6 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"All E-mails have been successfully sent to Partners:.\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
 msgid ""
@@ -298,6 +355,11 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
@@ -325,21 +387,11 @@ msgstr ""
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -380,11 +432,29 @@ msgstr ""
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -428,6 +498,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
 msgstr ""
 
@@ -444,6 +515,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
 msgstr ""
 
@@ -457,14 +529,6 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
@@ -476,25 +540,14 @@ msgstr ""
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid ""
-"\n"
-"\n"
-"E-Mail sent to following Partners successfully. !\n"
-"\n"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
 msgstr ""
 
 #. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
 msgstr ""
 
 #. module: account_followup
@@ -562,6 +615,7 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
 msgstr ""
 
@@ -575,6 +629,14 @@ msgstr ""
 msgid "Maturity"
 msgstr ""
 
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
@@ -635,3 +697,8 @@ msgstr ""
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Up Criteria"
 msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
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/report/account_followup_report.py b/addons/account_followup/report/account_followup_report.py
index ba0756f5c49..878f44ced30 100644
--- a/addons/account_followup/report/account_followup_report.py
+++ b/addons/account_followup/report/account_followup_report.py
@@ -55,14 +55,14 @@ class account_followup_stat(osv.osv):
             return super(account_followup_stat, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order,
                 context=context, count=count)
 
-    def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None):
+    def read_group(self, cr, uid, domain, *args, **kwargs):
             for arg in domain:
                 if arg[0] == 'period_id' and arg[2] == 'current_year':
                     current_year = self.pool.get('account.fiscalyear').find(cr, uid)
                     ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
                     domain.append(['period_id','in',ids])
                     domain.remove(arg)
-            return super(account_followup_stat, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context)
+            return super(account_followup_stat, self).read_group(cr, uid, domain, *args, **kwargs)
 
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'account_followup_stat')
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 85b2456d9e3..47e6e9f38cc 100644
--- a/addons/account_invoice_layout/i18n/sv.po
+++ b/addons/account_invoice_layout/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-13 10:42+0000\n"
-"Last-Translator: Anders Eriksson, Aspirix AB <ae@mobilasystem.se>\n"
+"PO-Revision-Date: 2010-12-15 00:14+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:22+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 daa92165615..f99189a8444 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement.py
+++ b/addons/account_payment/wizard/account_payment_populate_statement.py
@@ -62,7 +62,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 159de686764..9e27a592c96 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -31,7 +31,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
@@ -50,16 +50,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')
@@ -72,7 +75,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:
@@ -84,30 +88,34 @@ 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 _get_amount(self, cr, uid, context=None):
@@ -118,10 +126,12 @@ class account_voucher(osv.osv):
     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')
@@ -168,7 +178,7 @@ class account_voucher(osv.osv):
                 debit += l.amount
             for l in voucher.line_cr_ids:
                 credit += l.amount
-            res[voucher.id] =  abs(voucher.amount - abs(credit - debit)) 
+            res[voucher.id] =  abs(voucher.amount - abs(credit - debit))
         return res
 
     _name = 'account.voucher'
@@ -249,14 +259,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
@@ -267,10 +278,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
@@ -294,7 +305,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')
@@ -316,11 +327,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', []):
@@ -349,7 +360,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
 
@@ -369,8 +380,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'):
@@ -425,8 +436,15 @@ class account_voucher(osv.osv):
 
         if not partner_id:
             return default
-        journal = journal_pool.browse(cr, uid, journal_id)
-        partner = partner_pool.browse(cr, uid, partner_id)
+
+        if not partner_id and ids:
+            line_ids = line_pool.search(cr, uid, [('voucher_id', '=', ids[0])])
+            if line_ids:
+                line_pool.unlink(cr, uid, line_ids)
+            return default
+
+        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
@@ -455,7 +473,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':
@@ -511,7 +529,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
@@ -528,11 +546,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:
@@ -550,18 +568,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:
@@ -615,14 +633,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:
@@ -793,7 +811,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
@@ -832,7 +850,8 @@ class account_voucher_line(osv.osv):
     _defaults = {
         '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
 
@@ -867,6 +886,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')
@@ -874,7 +895,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'):
@@ -903,7 +924,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:
@@ -974,7 +995,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 2a1c6f730b1..9421681b8ee 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/ar.po b/addons/account_voucher/i18n/ar.po
index 2fcb53742b5..43eaca6bba4 100644
--- a/addons/account_voucher/i18n/ar.po
+++ b/addons/account_voucher/i18n/ar.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -430,7 +430,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "supplier Payment"
+msgid "Vendor Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -548,7 +548,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier"
+msgid "Vendor"
 msgstr ""
 
 #. module: account_voucher
@@ -680,7 +680,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open supplier Journal Entries"
+msgid "Open Vendor Journal Entries"
 msgstr ""
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/bg.po b/addons/account_voucher/i18n/bg.po
index 5d3154b021a..8e75142a50f 100644
--- a/addons/account_voucher/i18n/bg.po
+++ b/addons/account_voucher/i18n/bg.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -430,7 +430,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "supplier Payment"
+msgid "Vendor Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -548,7 +548,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier"
+msgid "Vendor"
 msgstr ""
 
 #. module: account_voucher
@@ -680,7 +680,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open supplier Journal Entries"
+msgid "Open Vendor Journal Entries"
 msgstr ""
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/bs.po b/addons/account_voucher/i18n/bs.po
index a2eac2afd93..2664a958b9e 100644
--- a/addons/account_voucher/i18n/bs.po
+++ b/addons/account_voucher/i18n/bs.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -430,7 +430,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "supplier Payment"
+msgid "Vendor Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -548,7 +548,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier"
+msgid "Vendor"
 msgstr ""
 
 #. module: account_voucher
@@ -680,7 +680,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open supplier Journal Entries"
+msgid "Open Vendor Journal Entries"
 msgstr ""
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/ca.po b/addons/account_voucher/i18n/ca.po
index 499e5515fef..1a9765cb289 100644
--- a/addons/account_voucher/i18n/ca.po
+++ b/addons/account_voucher/i18n/ca.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -430,7 +430,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "supplier Payment"
+msgid "Vendor Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -548,7 +548,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier"
+msgid "Vendor"
 msgstr ""
 
 #. module: account_voucher
@@ -680,7 +680,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open supplier Journal Entries"
+msgid "Open Vendor Journal Entries"
 msgstr ""
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr "Cancel·lat"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/cs.po b/addons/account_voucher/i18n/cs.po
index 2fcb53742b5..43eaca6bba4 100644
--- a/addons/account_voucher/i18n/cs.po
+++ b/addons/account_voucher/i18n/cs.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -430,7 +430,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "supplier Payment"
+msgid "Vendor Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -548,7 +548,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier"
+msgid "Vendor"
 msgstr ""
 
 #. module: account_voucher
@@ -680,7 +680,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open supplier Journal Entries"
+msgid "Open Vendor Journal Entries"
 msgstr ""
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/de.po b/addons/account_voucher/i18n/de.po
index 56e0dee6abf..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-14 04:33+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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -450,7 +450,7 @@ msgstr "Ausgleich OP zurücksetzen"
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "supplier Payment"
+msgid "Vendor Payment"
 msgstr "Buchen von Auszahlungen"
 
 #. module: account_voucher
@@ -573,7 +573,7 @@ msgstr "Kontoabstimmung?"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier"
+msgid "Vendor"
 msgstr "Lieferant"
 
 #. module: account_voucher
@@ -705,7 +705,7 @@ msgstr "Information Umsatz"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open supplier Journal Entries"
+msgid "Open Vendor Journal Entries"
 msgstr "Offene Posten Lieferanten"
 
 #. module: account_voucher
@@ -798,7 +798,7 @@ msgstr "Abgebrochen"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr "Eingangsrechnungen und andere offene Posten"
 
 #. module: account_voucher
@@ -1151,3 +1151,15 @@ msgstr ""
 
 #~ msgid "Size of the field can never be less than 1 !"
 #~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#~ msgid "supplier Payment"
+#~ msgstr "Buchen von Auszahlungen"
+
+#~ msgid "supplier"
+#~ msgstr "Lieferant"
+
+#~ msgid "Open supplier Journal Entries"
+#~ msgstr "Offene Posten Lieferanten"
+
+#~ msgid "supplier Invoices and Outstanding transactions"
+#~ msgstr "Eingangsrechnungen und andere offene Posten"
diff --git a/addons/account_voucher/i18n/el.po b/addons/account_voucher/i18n/el.po
index d3cb6633bca..f9c865beb8d 100644
--- a/addons/account_voucher/i18n/el.po
+++ b/addons/account_voucher/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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -774,7 +774,7 @@ msgstr "Ακυρωμένο"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
@@ -1117,9 +1117,3 @@ msgstr ""
 
 #~ msgid "Open Voucher Entries"
 #~ msgstr "Άνοιγμα Εγγραφών Παραστατικού"
-
-#~ msgid "Vendor Payment"
-#~ msgstr "Πληρωμή Πωλητή"
-
-#~ msgid "Vendor"
-#~ msgstr "Πωλητής"
diff --git a/addons/account_voucher/i18n/es.po b/addons/account_voucher/i18n/es.po
index 717f89b9aa5..5e0635fbfca 100644
--- a/addons/account_voucher/i18n/es.po
+++ b/addons/account_voucher/i18n/es.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -1110,21 +1110,12 @@ msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
 #~ msgid "Form view not available for Payment Lines"
 #~ msgstr "Vista formulario no disponible para líneas de pago"
 
-#~ msgid "Vendor Payment"
-#~ msgstr "Pago del vendedor"
-
 #~ msgid "Error ! You can not create recursive Menu."
 #~ msgstr "¡Error! No puede crear menús recursivos."
 
-#~ msgid "Vendor"
-#~ msgstr "Vendedor"
-
 #~ msgid "Extended options..."
 #~ msgstr "Opciones extras..."
 
-#~ msgid "Open Vendor Journal Entries"
-#~ msgstr "Abrir entradas diario de vendedores"
-
 #, python-format
 #~ msgid "Invalid Error !"
 #~ msgstr "¡Error no válido!"
@@ -1136,9 +1127,6 @@ msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
 #~ msgid "Rules are not supported for osv_memory objects !"
 #~ msgstr "¡Las reglas no son soportadas en objetos osv_memory!"
 
-#~ msgid "Vendor Invoices and Outstanding transactions"
-#~ msgstr "Facturas de vendedor y transacciones de salida"
-
 #~ msgid "Size of the field can never be less than 1 !"
 #~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 
diff --git a/addons/account_voucher/i18n/es_AR.po b/addons/account_voucher/i18n/es_AR.po
index da73d181d0b..73f0e36274f 100644
--- a/addons/account_voucher/i18n/es_AR.po
+++ b/addons/account_voucher/i18n/es_AR.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr "Cancelado"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/es_EC.po b/addons/account_voucher/i18n/es_EC.po
index 89d8b445333..4c1d488092d 100644
--- a/addons/account_voucher/i18n/es_EC.po
+++ b/addons/account_voucher/i18n/es_EC.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/et.po b/addons/account_voucher/i18n/et.po
index 73be73ae180..9dbbc3ebb02 100644
--- a/addons/account_voucher/i18n/et.po
+++ b/addons/account_voucher/i18n/et.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #~ msgid "Bank Receipt Voucher"
@@ -788,7 +788,7 @@ msgstr "Tühistatud"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/fr.po b/addons/account_voucher/i18n/fr.po
index 3f1d726879a..b1a5eb60e2f 100644
--- a/addons/account_voucher/i18n/fr.po
+++ b/addons/account_voucher/i18n/fr.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/hr.po b/addons/account_voucher/i18n/hr.po
index 1b458916a8f..25a10cb32bb 100644
--- a/addons/account_voucher/i18n/hr.po
+++ b/addons/account_voucher/i18n/hr.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/hu.po b/addons/account_voucher/i18n/hu.po
index 12b2bfcf2a3..7b59d550265 100644
--- a/addons/account_voucher/i18n/hu.po
+++ b/addons/account_voucher/i18n/hu.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/id.po b/addons/account_voucher/i18n/id.po
index 0ce7f966971..a1067f20700 100644
--- a/addons/account_voucher/i18n/id.po
+++ b/addons/account_voucher/i18n/id.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/it.po b/addons/account_voucher/i18n/it.po
index eb08c8a54b1..d52d8b39990 100644
--- a/addons/account_voucher/i18n/it.po
+++ b/addons/account_voucher/i18n/it.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -774,7 +774,7 @@ msgstr "Annullato"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
@@ -1091,6 +1091,3 @@ msgstr ""
 
 #~ msgid "Contra Voucher"
 #~ msgstr "Ricevuta di deposito"
-
-#~ msgid "Vendor Payment"
-#~ msgstr "Pagamenti fornitori"
diff --git a/addons/account_voucher/i18n/ko.po b/addons/account_voucher/i18n/ko.po
index ae7dae5fb7f..7705104647c 100644
--- a/addons/account_voucher/i18n/ko.po
+++ b/addons/account_voucher/i18n/ko.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -774,7 +774,7 @@ msgstr "취소됨"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index a714620b31c..5a75990b22d 100644
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/i18n/lt.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr "Atšaukta"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/nl.po b/addons/account_voucher/i18n/nl.po
index 3bc4ae5148a..3437ab6e8b2 100644
--- a/addons/account_voucher/i18n/nl.po
+++ b/addons/account_voucher/i18n/nl.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr "Geannuleerd"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/nl_BE.po b/addons/account_voucher/i18n/nl_BE.po
index b8e06e9b2c5..e8d66cd6c4b 100644
--- a/addons/account_voucher/i18n/nl_BE.po
+++ b/addons/account_voucher/i18n/nl_BE.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/oc.po b/addons/account_voucher/i18n/oc.po
index c795df1241d..0d6cd328614 100644
--- a/addons/account_voucher/i18n/oc.po
+++ b/addons/account_voucher/i18n/oc.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -774,7 +774,7 @@ msgstr "Anullat"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/pl.po b/addons/account_voucher/i18n/pl.po
index 656b61d00df..d328a40ce38 100644
--- a/addons/account_voucher/i18n/pl.po
+++ b/addons/account_voucher/i18n/pl.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr "Anulowano"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/pt.po b/addons/account_voucher/i18n/pt.po
index ecf8d0679a8..b2f57b297aa 100644
--- a/addons/account_voucher/i18n/pt.po
+++ b/addons/account_voucher/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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr "Candelado"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
@@ -945,6 +945,3 @@ msgstr ""
 
 #~ msgid "Contra Voucher"
 #~ msgstr "Contra Voucher"
-
-#~ msgid "Vendor"
-#~ msgstr "Vendedor"
diff --git a/addons/account_voucher/i18n/pt_BR.po b/addons/account_voucher/i18n/pt_BR.po
index 71f7a81145a..77c67c7d6e1 100644
--- a/addons/account_voucher/i18n/pt_BR.po
+++ b/addons/account_voucher/i18n/pt_BR.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/ro.po b/addons/account_voucher/i18n/ro.po
index 8857e046633..e5c601f790b 100644
--- a/addons/account_voucher/i18n/ro.po
+++ b/addons/account_voucher/i18n/ro.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr "Anulat"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/ru.po b/addons/account_voucher/i18n/ru.po
index 0d9cb789f5a..85ce439a0fd 100644
--- a/addons/account_voucher/i18n/ru.po
+++ b/addons/account_voucher/i18n/ru.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -773,7 +773,11 @@ msgstr "Отменено"
 
 #. module: account_voucher
 #: view:account.voucher:0
+<<<<<<< TREE
 msgid "Supplier Invoices and Outstanding transactions"
+=======
+msgid "Vendor Invoices and Outstanding transactions"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/sl.po b/addons/account_voucher/i18n/sl.po
index 7ab24377805..20c215ff3cb 100644
--- a/addons/account_voucher/i18n/sl.po
+++ b/addons/account_voucher/i18n/sl.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr "Preklicano"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/sq.po b/addons/account_voucher/i18n/sq.po
index d0762b12caf..08348f09cb9 100644
--- a/addons/account_voucher/i18n/sq.po
+++ b/addons/account_voucher/i18n/sq.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -774,7 +774,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/sr.po b/addons/account_voucher/i18n/sr.po
index affd16e2917..69bcc966f03 100644
--- a/addons/account_voucher/i18n/sr.po
+++ b/addons/account_voucher/i18n/sr.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -780,8 +780,8 @@ msgstr "Otkazano"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
-msgstr ""
+msgid "Vendor Invoices and Outstanding transactions"
+msgstr "Proizvodjacevi racuni i neobradjene transakcije"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,journal_ids:0
@@ -971,24 +971,15 @@ msgstr ""
 #~ msgid "Form view not available for Payment Lines"
 #~ msgstr "Pregled Forme nije dostupan za linije Placanja"
 
-#~ msgid "Vendor Payment"
-#~ msgstr "Placanja Proizvodjaca"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
-#~ msgid "Vendor"
-#~ msgstr "proizvođač"
-
 #~ msgid "Error ! You can not create recursive Menu."
 #~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
 
 #~ msgid "Extended options..."
 #~ msgstr "Dodatne Opcije"
 
-#~ msgid "Open Vendor Journal Entries"
-#~ msgstr "Otvori Dnevnik Proizvodjaca"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -1004,6 +995,3 @@ msgstr ""
 #, python-format
 #~ msgid "Invalid Error !"
 #~ msgstr "Nedefinisana Greska !"
-
-#~ msgid "Vendor Invoices and Outstanding transactions"
-#~ msgstr "Proizvodjacevi racuni i neobradjene transakcije"
diff --git a/addons/account_voucher/i18n/sr@latin.po b/addons/account_voucher/i18n/sr@latin.po
index 01b63b0b470..c1dcd5ce335 100644
--- a/addons/account_voucher/i18n/sr@latin.po
+++ b/addons/account_voucher/i18n/sr@latin.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -431,7 +431,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "supplier Payment"
+msgid "Vendor Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -774,7 +774,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/sv.po b/addons/account_voucher/i18n/sv.po
index 63c69e21bfc..84c3bde2900 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-09 11:31+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -29,7 +29,7 @@ msgstr "Betalningsreferens"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Customer Journal Entries"
-msgstr ""
+msgstr "Öppna kundjournal transaktioner"
 
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
@@ -46,7 +46,7 @@ msgstr "Gruppera efter"
 #: code:addons/account_voucher/account_voucher.py:0
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
-msgstr ""
+msgstr "Kan inte ta bort verifikation som redan är öppnade eller betalda !"
 
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
@@ -61,7 +61,7 @@ msgstr "Leverantör"
 #. module: account_voucher
 #: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_print
 msgid "Voucher Print"
-msgstr ""
+msgstr "Verifikationsutskriftf"
 
 #. module: account_voucher
 #: model:ir.module.module,description:account_voucher.module_meta_information
@@ -79,12 +79,12 @@ msgstr ""
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
 msgid "Bill Payment"
-msgstr ""
+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
@@ -773,7 +773,11 @@ msgstr "Avbruten"
 
 #. module: account_voucher
 #: view:account.voucher:0
+<<<<<<< TREE
 msgid "Supplier Invoices and Outstanding transactions"
+=======
+msgid "Vendor Invoices and Outstanding transactions"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/tlh.po b/addons/account_voucher/i18n/tlh.po
index 6ebc47a7976..51c90e626f9 100644
--- a/addons/account_voucher/i18n/tlh.po
+++ b/addons/account_voucher/i18n/tlh.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po
index 4c30b372948..f645232bcba 100644
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/i18n/tr.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr "İptal Edildi"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/uk.po b/addons/account_voucher/i18n/uk.po
index 613cf9cc5f8..dfd1aa97f1d 100644
--- a/addons/account_voucher/i18n/uk.po
+++ b/addons/account_voucher/i18n/uk.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/vi.po b/addons/account_voucher/i18n/vi.po
index 4e729fe45a9..139ed06c33b 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-14 05:28+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
@@ -774,7 +774,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/zh_CN.po b/addons/account_voucher/i18n/zh_CN.po
index e81f9a1262f..540129755a3 100644
--- a/addons/account_voucher/i18n/zh_CN.po
+++ b/addons/account_voucher/i18n/zh_CN.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr "已取消"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/zh_TW.po b/addons/account_voucher/i18n/zh_TW.po
index 7b431563560..bc1e45a04b2 100644
--- a/addons/account_voucher/i18n/zh_TW.po
+++ b/addons/account_voucher/i18n/zh_TW.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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -773,7 +773,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
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 c852c6d93b9..f87df6200d6 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/bs.po b/addons/analytic/i18n/bs.po
index ed7af184c40..3e69a7a9a09 100644
--- a/addons/analytic/i18n/bs.po
+++ b/addons/analytic/i18n/bs.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-09-29 10:36+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Bosnian <bs@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-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -22,13 +22,6 @@ msgstr ""
 msgid "Child Accounts"
 msgstr "Podkonta"
 
-#. module: analytic
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
-
 #. module: analytic
 #: field:account.analytic.account,name:0
 msgid "Account Name"
@@ -178,6 +171,11 @@ msgstr "Otkazano"
 msgid "Balance"
 msgstr "Saldo"
 
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,type:0
 msgid ""
@@ -190,11 +188,6 @@ msgstr ""
 msgid "Date End"
 msgstr "Završni datum"
 
-#. module: analytic
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Account Code"
@@ -244,6 +237,11 @@ msgstr "Analitičke stavke"
 #~ "Količina izražena u valuti vezanog konta, ukoliko se razlikuje od valute "
 #~ "poduzeća."
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
+
 #~ msgid "The related account currency if not equal to the company one."
 #~ msgstr "Valuta vezanog konta se razlikuje od valute poduzeća."
 
diff --git a/addons/analytic/i18n/de.po b/addons/analytic/i18n/de.po
index 3729528bfa3..0352cceb75e 100644
--- a/addons/analytic/i18n/de.po
+++ b/addons/analytic/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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-30 16:47+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-01 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -23,14 +23,6 @@ msgstr ""
 msgid "Child Accounts"
 msgstr "untergeordnete Konten"
 
-#. module: analytic
-#: 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: analytic
 #: field:account.analytic.account,name:0
 msgid "Account Name"
@@ -50,11 +42,6 @@ msgstr ""
 "Anwendung für die Definition von Analytischen Konten.\n"
 "    "
 
-#. module: analytic
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: analytic
 #: field:account.analytic.account,state:0
 msgid "State"
@@ -95,11 +82,6 @@ msgstr "Vorlage"
 msgid "Pending"
 msgstr "In Wartestellung"
 
-#. module: analytic
-#: 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 !"
-
 #. module: analytic
 #: model:ir.model,name:analytic.model_account_analytic_line
 msgid "Analytic Line"
@@ -122,11 +104,6 @@ msgstr "Normal"
 msgid "Company"
 msgstr "Unternehmen"
 
-#. module: analytic
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein !"
-
 #. module: analytic
 #: field:account.analytic.account,quantity_max:0
 msgid "Maximum Quantity"
@@ -198,6 +175,11 @@ msgstr "Abgebrochen"
 msgid "Balance"
 msgstr "Saldo"
 
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,type:0
 msgid ""
@@ -212,11 +194,6 @@ msgstr ""
 msgid "Date End"
 msgstr "Ende Datum"
 
-#. module: analytic
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Regeln werden für osv_memory Objekt nicht unterstützt"
-
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Account Code"
@@ -239,13 +216,6 @@ msgstr "Analytisches Konto"
 msgid "View"
 msgstr "Ansicht"
 
-#. module: analytic
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-"Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-"vorhanden sein !"
-
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Partner"
@@ -266,16 +236,17 @@ msgstr "Offen"
 msgid "Analytic Entries"
 msgstr "Analytische Buchungen"
 
-#. module: analytic
-#: 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 amount expressed in the related account currency if not equal to the "
 #~ "company one."
 #~ msgstr "Der Betrag in Fremdwährung, wenn diese von der Hauptwährung abweicht"
 
+#~ 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 ""
 #~ "Calculated by multiplying the quantity and the price given in the Product's "
 #~ "cost price."
@@ -292,3 +263,23 @@ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
 
 #~ msgid "The related account currency if not equal to the company one."
 #~ msgstr "Die zugeöhrige Währung, wenn abweichend von der Wirmenwährung."
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Regeln werden für osv_memory Objekt nicht unterstützt"
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr ""
+#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
+#~ "vorhanden sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/analytic/i18n/el.po b/addons/analytic/i18n/el.po
index a30345c5780..b3ff53b0387 100644
--- a/addons/analytic/i18n/el.po
+++ b/addons/analytic/i18n/el.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-10-23 07:01+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-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -22,14 +22,6 @@ msgstr ""
 msgid "Child Accounts"
 msgstr "Ελαχιστοβάθμιοι Λογαριασμοί"
 
-#. module: analytic
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Το όνομα του Αντικειμένου πρέπει να ξεκινά με x_ και δεν πρέπει να περιέχει "
-"ειδικούς χαρακτήρες!"
-
 #. module: analytic
 #: field:account.analytic.account,name:0
 msgid "Account Name"
@@ -177,6 +169,11 @@ msgstr "Ακυρώθηκε"
 msgid "Balance"
 msgstr "Υπόλοιπο"
 
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,type:0
 msgid ""
@@ -189,11 +186,6 @@ msgstr ""
 msgid "Date End"
 msgstr "Ημερομηνία Λήξης"
 
-#. module: analytic
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Account Code"
@@ -235,3 +227,9 @@ msgstr "Άνοιγμα"
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr "Εγγραφές Αναλυτικής"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Το όνομα του Αντικειμένου πρέπει να ξεκινά με x_ και δεν πρέπει να περιέχει "
+#~ "ειδικούς χαρακτήρες!"
diff --git a/addons/analytic/i18n/es.po b/addons/analytic/i18n/es.po
index 4bc64597de3..27645675c6c 100644
--- a/addons/analytic/i18n/es.po
+++ b/addons/analytic/i18n/es.po
@@ -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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
diff --git a/addons/analytic/i18n/es_EC.po b/addons/analytic/i18n/es_EC.po
index 95c61999d75..48f77afff02 100644
--- a/addons/analytic/i18n/es_EC.po
+++ b/addons/analytic/i18n/es_EC.po
@@ -2,14 +2,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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-22 20:42+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@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-11-23 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -17,14 +17,6 @@ msgstr ""
 msgid "Child Accounts"
 msgstr "Cuentas Hijas"
 
-#. module: analytic
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"El nombre del objeto debe empezar con x_ y no debe contener caracteres "
-"especiales !"
-
 #. module: analytic
 #: field:account.analytic.account,name:0
 msgid "Account Name"
@@ -44,11 +36,6 @@ msgstr ""
 "Modulo para definir objetos en la contabilidad de costos\n"
 "    "
 
-#. module: analytic
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "El nombre del módulo debe ser único !"
-
 #. module: analytic
 #: field:account.analytic.account,state:0
 msgid "State"
@@ -89,11 +76,6 @@ msgstr "Plantilla"
 msgid "Pending"
 msgstr "Pendiente"
 
-#. module: analytic
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "El ID del certificado del módulo debe ser único !"
-
 #. module: analytic
 #: model:ir.model,name:analytic.model_account_analytic_line
 msgid "Analytic Line"
@@ -116,11 +98,6 @@ msgstr "Normal"
 msgid "Company"
 msgstr "Compania"
 
-#. module: analytic
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "¡El nombre del grupo debe ser único!"
-
 #. module: analytic
 #: field:account.analytic.account,quantity_max:0
 msgid "Maximum Quantity"
@@ -191,6 +168,11 @@ msgstr "Cancelado"
 msgid "Balance"
 msgstr "Saldo"
 
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,type:0
 msgid ""
@@ -205,11 +187,6 @@ msgstr ""
 msgid "Date End"
 msgstr "Fecha Final"
 
-#. module: analytic
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "¡Las reglas no son compatibles con los objetos osv_memory!"
-
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Account Code"
@@ -232,11 +209,6 @@ msgstr "Cuenta Analitica"
 msgid "View"
 msgstr "Vista"
 
-#. module: analytic
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Partner"
@@ -256,8 +228,3 @@ msgstr "Abierto"
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr "Detalle Analitico"
-
-#. module: analytic
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Tamaño del campo nunca puede ser menor que 1 !"
diff --git a/addons/analytic/i18n/et.po b/addons/analytic/i18n/et.po
index bfa3496368c..4214e8a34df 100644
--- a/addons/analytic/i18n/et.po
+++ b/addons/analytic/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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-03 00:14+0000\n"
 "Last-Translator: lyyser <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-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -22,13 +22,6 @@ msgstr ""
 msgid "Child Accounts"
 msgstr "Alamkontod"
 
-#. module: analytic
-#: 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: analytic
 #: field:account.analytic.account,name:0
 msgid "Account Name"
@@ -176,6 +169,11 @@ msgstr "Katkestatud"
 msgid "Balance"
 msgstr "Balanss"
 
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,type:0
 msgid ""
@@ -188,11 +186,6 @@ msgstr ""
 msgid "Date End"
 msgstr "Lõppkuupäev"
 
-#. module: analytic
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Account Code"
@@ -235,6 +228,11 @@ msgstr "Ava"
 msgid "Analytic Entries"
 msgstr "Analüütilised kirjed"
 
+#~ 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 "Currency"
 #~ msgstr "Rahaühik"
 
diff --git a/addons/analytic/i18n/fr.po b/addons/analytic/i18n/fr.po
index ce169f1bf09..4388ff5ecc2 100644
--- a/addons/analytic/i18n/fr.po
+++ b/addons/analytic/i18n/fr.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-14 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
diff --git a/addons/analytic/i18n/it.po b/addons/analytic/i18n/it.po
index 9e31b2df46c..8600a6559bf 100644
--- a/addons/analytic/i18n/it.po
+++ b/addons/analytic/i18n/it.po
@@ -7,33 +7,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-22 07:27+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:42+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-11-23 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
-msgstr "Conto figlio"
-
-#. module: analytic
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
+msgstr "Conti figli"
 
 #. module: analytic
 #: field:account.analytic.account,name:0
 msgid "Account Name"
-msgstr "Nome del conto"
+msgstr "Nome Conto"
 
 #. module: analytic
 #: help:account.analytic.line,unit_amount:0
@@ -49,11 +41,6 @@ msgstr ""
 "Modulo per definire gli oggetti dei conti analitici\n"
 "    "
 
-#. module: analytic
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere unico!"
-
 #. module: analytic
 #: field:account.analytic.account,state:0
 msgid "State"
@@ -94,11 +81,6 @@ msgstr "Modello"
 msgid "Pending"
 msgstr "In sospeso"
 
-#. module: analytic
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "L'ID certificato del modulo deve essere unico!"
-
 #. module: analytic
 #: model:ir.model,name:analytic.model_account_analytic_line
 msgid "Analytic Line"
@@ -121,11 +103,6 @@ msgstr "Normale"
 msgid "Company"
 msgstr "Compagnia"
 
-#. module: analytic
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "Il nome del gruppo deve essere unico!"
-
 #. module: analytic
 #: field:account.analytic.account,quantity_max:0
 msgid "Maximum Quantity"
@@ -196,6 +173,11 @@ msgstr "Cancellato"
 msgid "Balance"
 msgstr "Saldo"
 
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Errore! Non è possibile creare conti analitici ricorsivi."
+
 #. module: analytic
 #: help:account.analytic.account,type:0
 msgid ""
@@ -210,11 +192,6 @@ msgstr ""
 msgid "Date End"
 msgstr "Data Fine"
 
-#. module: analytic
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Le regole non sono supportate per oggetti osv_memory !"
-
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Account Code"
@@ -237,11 +214,6 @@ msgstr "Conto Analitico"
 msgid "View"
 msgstr "Visualizza"
 
-#. module: analytic
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "La regola deve avere almento un diritto di accesso spuntato!"
-
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Partner"
@@ -262,10 +234,11 @@ msgstr "Aperto"
 msgid "Analytic Entries"
 msgstr "Voci Conto Analitico"
 
-#. module: analytic
-#: 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 iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
 
 #~ msgid ""
 #~ "* When an account is created its in 'Draft' state.                           "
@@ -320,3 +293,21 @@ msgstr "La dimensione del campo non può mai essere minore di 1!"
 
 #~ msgid "Amount currency"
 #~ msgstr "Importo valuta"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Le regole non sono supportate per oggetti osv_memory !"
+
+#~ 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 name of the group must be unique !"
+#~ msgstr "Il nome del gruppo deve essere unico!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "L'ID certificato del modulo deve essere unico!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Il nome del modulo deve essere unico!"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "La regola deve avere almento un diritto di accesso spuntato!"
diff --git a/addons/analytic/i18n/mn.po b/addons/analytic/i18n/mn.po
index 03e0d56719b..e54111f6ec4 100644
--- a/addons/analytic/i18n/mn.po
+++ b/addons/analytic/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-11-18 16:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-25 19:21+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-26 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -22,14 +22,6 @@ msgstr ""
 msgid "Child Accounts"
 msgstr "Дэд дансууд"
 
-#. module: analytic
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-"болохгүй!"
-
 #. module: analytic
 #: field:account.analytic.account,name:0
 msgid "Account Name"
@@ -47,11 +39,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: analytic
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,state:0
 msgid "State"
@@ -92,11 +79,6 @@ msgstr "Загвар"
 msgid "Pending"
 msgstr "Шийд хүлээсэн"
 
-#. module: analytic
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: analytic
 #: model:ir.model,name:analytic.model_account_analytic_line
 msgid "Analytic Line"
@@ -119,11 +101,6 @@ msgstr "Хэвийн"
 msgid "Company"
 msgstr "Компани"
 
-#. module: analytic
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,quantity_max:0
 msgid "Maximum Quantity"
@@ -192,6 +169,11 @@ msgstr "Цуцлагдсан"
 msgid "Balance"
 msgstr "Тэнцэл"
 
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,type:0
 msgid ""
@@ -204,11 +186,6 @@ msgstr ""
 msgid "Date End"
 msgstr "Дуусах огноо"
 
-#. module: analytic
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Account Code"
@@ -231,11 +208,6 @@ msgstr "Аналитик Данс"
 msgid "View"
 msgstr "Харах"
 
-#. module: analytic
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Partner"
@@ -256,11 +228,6 @@ msgstr "Нээх"
 msgid "Analytic Entries"
 msgstr "Аналитик бичилт"
 
-#. module: analytic
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #~ msgid "Currency"
 #~ msgstr "Валют"
 
@@ -269,3 +236,9 @@ msgstr ""
 
 #~ msgid "Associated Partner"
 #~ msgstr "Холбогдох харилцагч"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+#~ "болохгүй!"
diff --git a/addons/analytic/i18n/nl.po b/addons/analytic/i18n/nl.po
index b6b5c329d89..448694d7c4c 100644
--- a/addons/analytic/i18n/nl.po
+++ b/addons/analytic/i18n/nl.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-04 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
diff --git a/addons/analytic/i18n/pl.po b/addons/analytic/i18n/pl.po
index 8c2169d1417..7442ebaa33c 100644
--- a/addons/analytic/i18n/pl.po
+++ b/addons/analytic/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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-03 00:15+0000\n"
 "Last-Translator: mga (Open ERP) <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-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -22,14 +22,6 @@ msgstr ""
 msgid "Child Accounts"
 msgstr "Konta podrzędne"
 
-#. module: analytic
-#: 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: analytic
 #: field:account.analytic.account,name:0
 msgid "Account Name"
@@ -179,6 +171,11 @@ msgstr "Anulowano"
 msgid "Balance"
 msgstr "Saldo"
 
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,type:0
 msgid ""
@@ -191,11 +188,6 @@ msgstr ""
 msgid "Date End"
 msgstr "Data końcowa"
 
-#. module: analytic
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Account Code"
@@ -244,6 +236,12 @@ msgstr "Zapisy analityczne"
 #~ msgstr ""
 #~ "Kwota wyrażona w walucie konta, jeśli waluta jest inna niż waluta firmy."
 
+#~ 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 "The related account currency if not equal to the company one."
 #~ msgstr "Waluta konta, jeśli waluta jest inna niż firmy."
 
diff --git a/addons/analytic/i18n/pt.po b/addons/analytic/i18n/pt.po
index 57bff87cbcc..d0cc0635bd3 100644
--- a/addons/analytic/i18n/pt.po
+++ b/addons/analytic/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:42+0000\n"
-"PO-Revision-Date: 2010-12-03 07:38+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-14 12:20+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <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-04 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -38,6 +38,8 @@ msgid ""
 "Module for defining analytic accounting object.\n"
 "    "
 msgstr ""
+"Módulo para definir um objeto de contabilidade analítica.\n"
+"    "
 
 #. module: analytic
 #: field:account.analytic.account,state:0
@@ -82,7 +84,7 @@ msgstr "Pendente"
 #. module: analytic
 #: model:ir.model,name:analytic.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Linha analítica"
 
 #. module: analytic
 #: field:account.analytic.account,description:0
@@ -142,7 +144,7 @@ msgstr ""
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid "Sets the higher limit of quantity of hours."
-msgstr ""
+msgstr "Estabelece o limite máximo de horas"
 
 #. module: analytic
 #: field:account.analytic.account,credit:0
@@ -172,7 +174,7 @@ msgstr ""
 #. module: analytic
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Erro! Não pode criar contas analíticas recursivamente"
 
 #. module: analytic
 #: help:account.analytic.account,type:0
@@ -184,7 +186,7 @@ msgstr ""
 #. module: analytic
 #: field:account.analytic.account,date:0
 msgid "Date End"
-msgstr ""
+msgstr "Data final"
 
 #. module: analytic
 #: field:account.analytic.account,code:0
@@ -221,7 +223,7 @@ msgstr "Data de início"
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Open"
-msgstr ""
+msgstr "Abrir"
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/pt_BR.po b/addons/analytic/i18n/pt_BR.po
index bc7705dcd74..ba8c3ed9b88 100644
--- a/addons/analytic/i18n/pt_BR.po
+++ b/addons/analytic/i18n/pt_BR.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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+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 e37662a7886..88c0ff0d3c5 100644
--- a/addons/analytic/i18n/sl.po
+++ b/addons/analytic/i18n/sl.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"
-"PO-Revision-Date: 2010-08-03 00:15+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\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-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -22,13 +22,6 @@ msgstr ""
 msgid "Child Accounts"
 msgstr "Podrejeni konti"
 
-#. module: analytic
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
-
 #. module: analytic
 #: field:account.analytic.account,name:0
 msgid "Account Name"
@@ -89,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
@@ -176,6 +169,11 @@ msgstr "Preklicano"
 msgid "Balance"
 msgstr "Stanje"
 
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Napaka! Ne morete kreirati rekurzivnih analitičnih kontov."
+
 #. module: analytic
 #: help:account.analytic.account,type:0
 msgid ""
@@ -188,11 +186,6 @@ msgstr ""
 msgid "Date End"
 msgstr "Datum konca"
 
-#. module: analytic
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Account Code"
@@ -218,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
@@ -235,6 +228,11 @@ msgstr "Odpri"
 msgid "Analytic Entries"
 msgstr "Analitične vknjižbe"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
+
 #~ msgid "Currency"
 #~ msgstr "Valuta"
 
diff --git a/addons/analytic/i18n/sr.po b/addons/analytic/i18n/sr.po
index dfb3c0f31a6..f37e83f1dcb 100644
--- a/addons/analytic/i18n/sr.po
+++ b/addons/analytic/i18n/sr.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-10-26 08:24+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -22,13 +22,6 @@ msgstr ""
 msgid "Child Accounts"
 msgstr "Podređeni Nalozi"
 
-#. module: analytic
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
 #. module: analytic
 #: field:account.analytic.account,name:0
 msgid "Account Name"
@@ -180,6 +173,11 @@ msgstr "Otkazano"
 msgid "Balance"
 msgstr "Saldo"
 
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,type:0
 msgid ""
@@ -194,11 +192,6 @@ msgstr ""
 msgid "Date End"
 msgstr "Završni datum"
 
-#. module: analytic
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
-
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Account Code"
@@ -247,6 +240,11 @@ msgstr "Analitičke stavke"
 #~ msgstr ""
 #~ "Vrednost izrazena u datom iznosu valute ako nije jednaka valuti preduzeca"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
 #~ msgid "The related account currency if not equal to the company one."
 #~ msgstr "Dati iznos valute ako nije jednaka valuti preduzeca"
 
@@ -296,3 +294,6 @@ msgstr "Analitičke stavke"
 
 #~ msgid "Amount currency"
 #~ msgstr "Iznos valute"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
diff --git a/addons/analytic/i18n/sr@latin.po b/addons/analytic/i18n/sr@latin.po
index 03d3f3628c1..6986e666979 100644
--- a/addons/analytic/i18n/sr@latin.po
+++ b/addons/analytic/i18n/sr@latin.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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
diff --git a/addons/analytic/i18n/sv.po b/addons/analytic/i18n/sv.po
index 51259f27f21..897177ac347 100644
--- a/addons/analytic/i18n/sv.po
+++ b/addons/analytic/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-11-18 16:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-12-02 09:05+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-03 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -22,13 +22,6 @@ msgstr ""
 msgid "Child Accounts"
 msgstr "Underliggande konton"
 
-#. module: analytic
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
 #. module: analytic
 #: field:account.analytic.account,name:0
 msgid "Account Name"
@@ -46,11 +39,6 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: analytic
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Namnet på modulen måste vara unikt!"
-
 #. module: analytic
 #: field:account.analytic.account,state:0
 msgid "State"
@@ -91,11 +79,6 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
-#. module: analytic
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Certifikat ID för modulen måste vara unikt!"
-
 #. module: analytic
 #: model:ir.model,name:analytic.model_account_analytic_line
 msgid "Analytic Line"
@@ -118,11 +101,6 @@ msgstr "Normal"
 msgid "Company"
 msgstr "Företag"
 
-#. module: analytic
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "Namnet på gruppen måste vara unikt!"
-
 #. module: analytic
 #: field:account.analytic.account,quantity_max:0
 msgid "Maximum Quantity"
@@ -191,6 +169,11 @@ msgstr "Avbruten"
 msgid "Balance"
 msgstr "Balans"
 
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,type:0
 msgid ""
@@ -203,11 +186,6 @@ msgstr ""
 msgid "Date End"
 msgstr "Slutdatum"
 
-#. module: analytic
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Account Code"
@@ -230,11 +208,6 @@ msgstr ""
 msgid "View"
 msgstr "Vy"
 
-#. module: analytic
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Partner"
@@ -255,7 +228,16 @@ msgstr ""
 msgid "Analytic Entries"
 msgstr ""
 
-#. module: analytic
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Namnet på modulen måste vara unikt!"
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "Namnet på gruppen måste vara unikt!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Certifikat ID för modulen måste vara unikt!"
diff --git a/addons/analytic/i18n/zh_CN.po b/addons/analytic/i18n/zh_CN.po
index 44b5aa0dd0e..14052a17df9 100644
--- a/addons/analytic/i18n/zh_CN.po
+++ b/addons/analytic/i18n/zh_CN.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-03 00:16+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\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-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -22,12 +22,6 @@ msgstr ""
 msgid "Child Accounts"
 msgstr "子项"
 
-#. module: analytic
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以x_开头并且不能包含特殊字符"
-
 #. module: analytic
 #: field:account.analytic.account,name:0
 msgid "Account Name"
@@ -177,6 +171,11 @@ msgstr "已取消"
 msgid "Balance"
 msgstr "差额"
 
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic
 #: help:account.analytic.account,type:0
 msgid ""
@@ -189,11 +188,6 @@ msgstr ""
 msgid "Date End"
 msgstr "结束日期"
 
-#. module: analytic
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Account Code"
@@ -241,6 +235,10 @@ msgstr "辅助核算记录"
 #~ "company one."
 #~ msgstr "如果不是同一公司, 这金额表示相关项的货币"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名必须以x_开头并且不能包含特殊字符"
+
 #~ msgid "The related account currency if not equal to the company one."
 #~ msgstr "如果不是同一公司, 这相关项的货币"
 
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/ar.po b/addons/analytic_journal_billing_rate/i18n/ar.po
index 4ebb6ca8740..42aefc78c10 100644
--- a/addons/analytic_journal_billing_rate/i18n/ar.po
+++ b/addons/analytic_journal_billing_rate/i18n/ar.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/bg.po b/addons/analytic_journal_billing_rate/i18n/bg.po
index 54bb0bebfe9..acb2049f2d5 100644
--- a/addons/analytic_journal_billing_rate/i18n/bg.po
+++ b/addons/analytic_journal_billing_rate/i18n/bg.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/bs.po b/addons/analytic_journal_billing_rate/i18n/bs.po
index d45a2712953..62e212de58d 100644
--- a/addons/analytic_journal_billing_rate/i18n/bs.po
+++ b/addons/analytic_journal_billing_rate/i18n/bs.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/ca.po b/addons/analytic_journal_billing_rate/i18n/ca.po
index af0d0159188..62499446ee6 100644
--- a/addons/analytic_journal_billing_rate/i18n/ca.po
+++ b/addons/analytic_journal_billing_rate/i18n/ca.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/cs.po b/addons/analytic_journal_billing_rate/i18n/cs.po
index 4ebb6ca8740..42aefc78c10 100644
--- a/addons/analytic_journal_billing_rate/i18n/cs.po
+++ b/addons/analytic_journal_billing_rate/i18n/cs.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/de.po b/addons/analytic_journal_billing_rate/i18n/de.po
index ab11d936e19..f0b36a4c603 100644
--- a/addons/analytic_journal_billing_rate/i18n/de.po
+++ b/addons/analytic_journal_billing_rate/i18n/de.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/el.po b/addons/analytic_journal_billing_rate/i18n/el.po
index b2d2820b08a..bac6cf4ade0 100644
--- a/addons/analytic_journal_billing_rate/i18n/el.po
+++ b/addons/analytic_journal_billing_rate/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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/es.po b/addons/analytic_journal_billing_rate/i18n/es.po
index 9a673a98c6d..a09cf0d12cc 100644
--- a/addons/analytic_journal_billing_rate/i18n/es.po
+++ b/addons/analytic_journal_billing_rate/i18n/es.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/es_AR.po b/addons/analytic_journal_billing_rate/i18n/es_AR.po
index bd2fd829c8b..715bc66891f 100644
--- a/addons/analytic_journal_billing_rate/i18n/es_AR.po
+++ b/addons/analytic_journal_billing_rate/i18n/es_AR.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/es_EC.po b/addons/analytic_journal_billing_rate/i18n/es_EC.po
index 763224ef2c7..230d0981f9e 100644
--- a/addons/analytic_journal_billing_rate/i18n/es_EC.po
+++ b/addons/analytic_journal_billing_rate/i18n/es_EC.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/et.po b/addons/analytic_journal_billing_rate/i18n/et.po
index 84361d6a808..64b111d682b 100644
--- a/addons/analytic_journal_billing_rate/i18n/et.po
+++ b/addons/analytic_journal_billing_rate/i18n/et.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/fr.po b/addons/analytic_journal_billing_rate/i18n/fr.po
index c64d8784e05..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-11 05:05+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/gl.po b/addons/analytic_journal_billing_rate/i18n/gl.po
index 931d1ad205a..f8c99643d91 100644
--- a/addons/analytic_journal_billing_rate/i18n/gl.po
+++ b/addons/analytic_journal_billing_rate/i18n/gl.po
@@ -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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/hr.po b/addons/analytic_journal_billing_rate/i18n/hr.po
index e4271b9c87f..5f365d86db4 100644
--- a/addons/analytic_journal_billing_rate/i18n/hr.po
+++ b/addons/analytic_journal_billing_rate/i18n/hr.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/hu.po b/addons/analytic_journal_billing_rate/i18n/hu.po
index 4ebb6ca8740..42aefc78c10 100644
--- a/addons/analytic_journal_billing_rate/i18n/hu.po
+++ b/addons/analytic_journal_billing_rate/i18n/hu.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/id.po b/addons/analytic_journal_billing_rate/i18n/id.po
index 185264108fc..41fe0b62e6e 100644
--- a/addons/analytic_journal_billing_rate/i18n/id.po
+++ b/addons/analytic_journal_billing_rate/i18n/id.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/it.po b/addons/analytic_journal_billing_rate/i18n/it.po
index a5938798e8f..677210543ab 100644
--- a/addons/analytic_journal_billing_rate/i18n/it.po
+++ b/addons/analytic_journal_billing_rate/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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/ko.po b/addons/analytic_journal_billing_rate/i18n/ko.po
index 9f4d4018195..2ff943fd281 100644
--- a/addons/analytic_journal_billing_rate/i18n/ko.po
+++ b/addons/analytic_journal_billing_rate/i18n/ko.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/lt.po b/addons/analytic_journal_billing_rate/i18n/lt.po
index 903e403d69e..939ca6e0e8b 100644
--- a/addons/analytic_journal_billing_rate/i18n/lt.po
+++ b/addons/analytic_journal_billing_rate/i18n/lt.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/nl.po b/addons/analytic_journal_billing_rate/i18n/nl.po
index cdffbfdf9bc..49a8ea6d4a1 100644
--- a/addons/analytic_journal_billing_rate/i18n/nl.po
+++ b/addons/analytic_journal_billing_rate/i18n/nl.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/nl_BE.po b/addons/analytic_journal_billing_rate/i18n/nl_BE.po
index ac021864f6a..454d46d12ea 100644
--- a/addons/analytic_journal_billing_rate/i18n/nl_BE.po
+++ b/addons/analytic_journal_billing_rate/i18n/nl_BE.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/oc.po b/addons/analytic_journal_billing_rate/i18n/oc.po
index 1dd6d5c96f7..aad5f19a36a 100644
--- a/addons/analytic_journal_billing_rate/i18n/oc.po
+++ b/addons/analytic_journal_billing_rate/i18n/oc.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/pl.po b/addons/analytic_journal_billing_rate/i18n/pl.po
index 6ee356db559..1a268504559 100644
--- a/addons/analytic_journal_billing_rate/i18n/pl.po
+++ b/addons/analytic_journal_billing_rate/i18n/pl.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/pt.po b/addons/analytic_journal_billing_rate/i18n/pt.po
index 05c8cb2bb04..7a514607850 100644
--- a/addons/analytic_journal_billing_rate/i18n/pt.po
+++ b/addons/analytic_journal_billing_rate/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-10 17:14+0000\n"
-"PO-Revision-Date: 2010-12-04 09:07+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-14 12:15+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
@@ -29,7 +29,7 @@ msgstr ""
 #. module: analytic_journal_billing_rate
 #: constraint:account.invoice:0
 msgid "Error: BVR reference is required."
-msgstr ""
+msgstr "Erro: É necessária a referência BVR."
 
 #. module: analytic_journal_billing_rate
 #: view:analytic_journal_rate_grid:0
@@ -77,7 +77,7 @@ msgstr "Erro! Não pode criar contas analíticas recursivamente"
 #. module: analytic_journal_billing_rate
 #: constraint:account.invoice:0
 msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
+msgstr "Erro! Número BVR inválido (soma de controlo errada)"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML Inválido para a Arquitectura de Vista !"
diff --git a/addons/analytic_journal_billing_rate/i18n/pt_BR.po b/addons/analytic_journal_billing_rate/i18n/pt_BR.po
index d7678b10338..d8114963223 100644
--- a/addons/analytic_journal_billing_rate/i18n/pt_BR.po
+++ b/addons/analytic_journal_billing_rate/i18n/pt_BR.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/ro.po b/addons/analytic_journal_billing_rate/i18n/ro.po
index 576f6a0126a..b86279ca42f 100644
--- a/addons/analytic_journal_billing_rate/i18n/ro.po
+++ b/addons/analytic_journal_billing_rate/i18n/ro.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/ru.po b/addons/analytic_journal_billing_rate/i18n/ru.po
index b293996aa9e..fbd26a86620 100644
--- a/addons/analytic_journal_billing_rate/i18n/ru.po
+++ b/addons/analytic_journal_billing_rate/i18n/ru.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/sl.po b/addons/analytic_journal_billing_rate/i18n/sl.po
index 72fd853f972..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-11 05:05+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_journal_billing_rate/i18n/sq.po b/addons/analytic_journal_billing_rate/i18n/sq.po
index 7feff2f7604..72229e66f34 100644
--- a/addons/analytic_journal_billing_rate/i18n/sq.po
+++ b/addons/analytic_journal_billing_rate/i18n/sq.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/sr.po b/addons/analytic_journal_billing_rate/i18n/sr.po
index 69a852a1c1d..68179f99042 100644
--- a/addons/analytic_journal_billing_rate/i18n/sr.po
+++ b/addons/analytic_journal_billing_rate/i18n/sr.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/sr@latin.po b/addons/analytic_journal_billing_rate/i18n/sr@latin.po
index ce8e81e9b09..cdcd5292ad4 100644
--- a/addons/analytic_journal_billing_rate/i18n/sr@latin.po
+++ b/addons/analytic_journal_billing_rate/i18n/sr@latin.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/sv.po b/addons/analytic_journal_billing_rate/i18n/sv.po
index d8a763e21ea..65b182d4592 100644
--- a/addons/analytic_journal_billing_rate/i18n/sv.po
+++ b/addons/analytic_journal_billing_rate/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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/tlh.po b/addons/analytic_journal_billing_rate/i18n/tlh.po
index 6a153a62837..f8c0c94fb16 100644
--- a/addons/analytic_journal_billing_rate/i18n/tlh.po
+++ b/addons/analytic_journal_billing_rate/i18n/tlh.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po
index c8bb231d218..93c19ed1157 100644
--- a/addons/analytic_journal_billing_rate/i18n/tr.po
+++ b/addons/analytic_journal_billing_rate/i18n/tr.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/uk.po b/addons/analytic_journal_billing_rate/i18n/uk.po
index d9725bdf7f1..33116e01e36 100644
--- a/addons/analytic_journal_billing_rate/i18n/uk.po
+++ b/addons/analytic_journal_billing_rate/i18n/uk.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/vi.po b/addons/analytic_journal_billing_rate/i18n/vi.po
index 46d0eba76a8..f7821ae61d7 100644
--- a/addons/analytic_journal_billing_rate/i18n/vi.po
+++ b/addons/analytic_journal_billing_rate/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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/zh_CN.po b/addons/analytic_journal_billing_rate/i18n/zh_CN.po
index 36d62077ea8..3af9604dac8 100644
--- a/addons/analytic_journal_billing_rate/i18n/zh_CN.po
+++ b/addons/analytic_journal_billing_rate/i18n/zh_CN.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/zh_TW.po b/addons/analytic_journal_billing_rate/i18n/zh_TW.po
index 033c6e52366..91d280b96cd 100644
--- a/addons/analytic_journal_billing_rate/i18n/zh_TW.po
+++ b/addons/analytic_journal_billing_rate/i18n/zh_TW.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
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/ar.po b/addons/analytic_user_function/i18n/ar.po
index f6c9d5bbad1..00fb363ef6e 100644
--- a/addons/analytic_user_function/i18n/ar.po
+++ b/addons/analytic_user_function/i18n/ar.po
@@ -6,19 +6,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: analytic_user_function
@@ -32,31 +32,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr ""
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -68,24 +49,27 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
diff --git a/addons/analytic_user_function/i18n/bg.po b/addons/analytic_user_function/i18n/bg.po
index c4118186554..07ec9be2f48 100644
--- a/addons/analytic_user_function/i18n/bg.po
+++ b/addons/analytic_user_function/i18n/bg.po
@@ -6,20 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-02-03 09:18+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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -32,33 +32,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-"символи!"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr ""
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -70,25 +49,37 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Невалиден XML за преглед на архитектурата"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
+#~ "символи!"
diff --git a/addons/analytic_user_function/i18n/bs.po b/addons/analytic_user_function/i18n/bs.po
index 94b6c7ce656..f83574ebd44 100644
--- a/addons/analytic_user_function/i18n/bs.po
+++ b/addons/analytic_user_function/i18n/bs.po
@@ -6,20 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-02-03 08:33+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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -32,31 +32,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr ""
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -68,25 +49,31 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
diff --git a/addons/analytic_user_function/i18n/ca.po b/addons/analytic_user_function/i18n/ca.po
index c891ecc8511..5d924e25320 100644
--- a/addons/analytic_user_function/i18n/ca.po
+++ b/addons/analytic_user_function/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-10-30 14:54+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-31 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Producte"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -33,35 +33,12 @@ msgstr "Error!"
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-"especial!"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "Producte"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Compte analític"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-"No s'ha definit un compte de despeses \r\n"
-"per aquest producte: \"%s\" (id:%d)"
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -73,27 +50,53 @@ msgstr "Rel. usuaris/productes"
 msgid "User"
 msgstr "Usuari"
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr "Taula de relació entre usuaris i productes d'un compte analític"
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr "Funció analítica d'usuari"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-"No s'ha definit un compte de despeses \r\n"
-"per aquest producte: \"%s\" (id:%d)"
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Producte de l'usuari per aquesta compte analític"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invàlid per a la definició de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+#~ "especial!"
+
+#, python-format
+#~ msgid ""
+#~ "There is no expense account define ' \\n                                'for "
+#~ "this product: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "No s'ha definit un compte de despeses \r\n"
+#~ "per aquest producte: \"%s\" (id:%d)"
+
+#, python-format
+#~ msgid ""
+#~ "There is no expense account define ' \\n                                    "
+#~ "'for this product: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "No s'ha definit un compte de despeses \r\n"
+#~ "per aquest producte: \"%s\" (id:%d)"
diff --git a/addons/analytic_user_function/i18n/cs.po b/addons/analytic_user_function/i18n/cs.po
index 69f6205b8ee..2681925cc6f 100644
--- a/addons/analytic_user_function/i18n/cs.po
+++ b/addons/analytic_user_function/i18n/cs.po
@@ -6,20 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-10-30 10:06+0000\n"
 "Last-Translator: Konki <pavel.konkol@seznam.cz>\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-10-31 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalidní XML pro zobrazení architektury!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Produkt"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -32,32 +32,12 @@ msgstr "Chyba !"
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analytický účet"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -69,25 +49,36 @@ msgstr "Uživatelé/Produktové vztahy"
 msgid "User"
 msgstr "Uživatel"
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr "Vztah mezi uživateli a tabulkou produktů na analytickém účtu"
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr "Analytická uživatelská funkce"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Uživatelský produkt pro tento Analytický Účet"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalidní XML pro zobrazení architektury!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
diff --git a/addons/analytic_user_function/i18n/de.po b/addons/analytic_user_function/i18n/de.po
index aca19aafd22..3157de1efe6 100644
--- a/addons/analytic_user_function/i18n/de.po
+++ b/addons/analytic_user_function/i18n/de.po
@@ -6,7 +6,7 @@ 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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-30 17:41+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,18 +14,13 @@ 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-01 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: 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 !"
-
-#. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Produkt"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -38,30 +33,12 @@ msgstr "Fehler !"
 msgid "Timesheet Line"
 msgstr "Zeiterfassung Positionen"
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analytisches Konto"
 
-#. module: analytic_user_function
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -84,17 +61,35 @@ msgstr "Es ist kein Aufwandskonto definiert für:\"%s\"(id:%d)"
 msgid "Relation table between users and products on a analytic account"
 msgstr "Relation zwischen Benutzern und Produkten"
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr "Analytische Benutzer Funktion"
 
-#. module: analytic_user_function
-#: 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 !"
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Produkte des Benutzers"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
+#~ 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 !"
diff --git a/addons/analytic_user_function/i18n/el.po b/addons/analytic_user_function/i18n/el.po
index 9259e560008..d1046187883 100644
--- a/addons/analytic_user_function/i18n/el.po
+++ b/addons/analytic_user_function/i18n/el.po
@@ -7,20 +7,20 @@ 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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-03 02:54+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Προϊόν"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -33,33 +33,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Το όνομα του αντικειμένου θα πρέπει να ξεκινάει με x_ και να μην περιέχει "
-"ειδικούς χαρακτήρες!"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "Προϊόν"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Αναλυτική Λογαριασμού"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -71,26 +50,38 @@ msgstr "Χρήστες/σχ. Προϊόντα"
 msgid "User"
 msgstr "Χρήστης"
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr ""
 "Πίνακας Σχέσεων μεταξύ χρηστών και προϊόντων στον αναλυτικό λογαριασμό"
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr "Αναλυτική Λειτουργία Χρήστη"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Τα Προϊόντα του Χρήστη για αυτόν τον Αναλυτικό Λογαριασμό"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Το όνομα του αντικειμένου θα πρέπει να ξεκινάει με x_ και να μην περιέχει "
+#~ "ειδικούς χαρακτήρες!"
diff --git a/addons/analytic_user_function/i18n/es.po b/addons/analytic_user_function/i18n/es.po
index 4f3995da9a1..db2c8a53ecf 100644
--- a/addons/analytic_user_function/i18n/es.po
+++ b/addons/analytic_user_function/i18n/es.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/es_AR.po b/addons/analytic_user_function/i18n/es_AR.po
index 6c62c5293fc..b65d7c38d7b 100644
--- a/addons/analytic_user_function/i18n/es_AR.po
+++ b/addons/analytic_user_function/i18n/es_AR.po
@@ -6,20 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-09-16 17:44+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Producto"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -32,33 +32,12 @@ msgstr "¡Error!"
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
-"especial!"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "Producto"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Cuenta Analítica"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -70,25 +49,37 @@ msgstr "Relación usuarios/productos"
 msgid "User"
 msgstr "Usuario"
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr "Tabla de relación entre usuarios y productos en una cuenta analítica"
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr "Función de usuario analítico"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Producto del usuario para esta cuenta analítica"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
+#~ "especial!"
diff --git a/addons/analytic_user_function/i18n/es_EC.po b/addons/analytic_user_function/i18n/es_EC.po
index 36929a019e9..96e494d1d40 100644
--- a/addons/analytic_user_function/i18n/es_EC.po
+++ b/addons/analytic_user_function/i18n/es_EC.po
@@ -6,20 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-09-17 19:07+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -32,33 +32,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr ""
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Cuenta analítica"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -70,24 +49,27 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
diff --git a/addons/analytic_user_function/i18n/et.po b/addons/analytic_user_function/i18n/et.po
index d019296d70f..a332b3b830b 100644
--- a/addons/analytic_user_function/i18n/et.po
+++ b/addons/analytic_user_function/i18n/et.po
@@ -6,20 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-10-30 15:57+0000\n"
 "Last-Translator: Ahti Hinnov <sipelgas@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-10-31 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Toode"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -32,32 +32,12 @@ msgstr "Viga !"
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: 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: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "Toode"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analüütiline konto"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -69,25 +49,36 @@ msgstr "Kasutajate/Toodete seosed"
 msgid "User"
 msgstr "Kasutaja"
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr "Seose tabel kasutajate ja toodete vahel analüütilisel kontol"
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr "Analüüsi kasutaj funktsioone"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Kasutaja tooted sellel analüütilisel kontol"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Vigane XML vaate arhitektuurile!"
+
+#~ 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 !"
diff --git a/addons/analytic_user_function/i18n/fr.po b/addons/analytic_user_function/i18n/fr.po
index 013692672f9..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-05 04:52+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/gl.po b/addons/analytic_user_function/i18n/gl.po
index 0b1d9c56b6f..6226c40ee3a 100644
--- a/addons/analytic_user_function/i18n/gl.po
+++ b/addons/analytic_user_function/i18n/gl.po
@@ -8,20 +8,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: analytic-user-function-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-08-17 08:29+0000\n"
 "Last-Translator: Frco. Javier Rial <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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML non válido para a definición da vista!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Produto"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -34,33 +34,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡O nome do obxecto debe comezar con x_ y e non conter ningún carácter "
-"especial!"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "Produto"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -72,25 +51,37 @@ msgstr "Rel. usuarios/produtos"
 msgid "User"
 msgstr "Usuario"
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr "Táboa de relación entre usuarios e produtos dunha conta analítica"
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Produto do usuario para esta conta analítica"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML non válido para a definición da vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡O nome do obxecto debe comezar con x_ y e non conter ningún carácter "
+#~ "especial!"
diff --git a/addons/analytic_user_function/i18n/hr.po b/addons/analytic_user_function/i18n/hr.po
index 55bfcde1dd8..0348b0a1a4b 100644
--- a/addons/analytic_user_function/i18n/hr.po
+++ b/addons/analytic_user_function/i18n/hr.po
@@ -6,21 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-03 02:55+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: Vinteh\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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nepravilan XML format za View Architecture!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Proizvod"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -33,32 +33,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "Proizvod"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analitički Konto"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -70,25 +50,36 @@ msgstr "veza Korisnici/Proizvodi"
 msgid "User"
 msgstr "Korisnik"
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr "Vza između korisnika i proizvoda kod Analitičkog konta."
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr "Funkcija Analitičkog Korisnika"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Korisnikov Proizvod za ovaj Analitički konto."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nepravilan XML format za View Architecture!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
diff --git a/addons/analytic_user_function/i18n/hu.po b/addons/analytic_user_function/i18n/hu.po
index f6c9d5bbad1..00fb363ef6e 100644
--- a/addons/analytic_user_function/i18n/hu.po
+++ b/addons/analytic_user_function/i18n/hu.po
@@ -6,19 +6,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: analytic_user_function
@@ -32,31 +32,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr ""
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -68,24 +49,27 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
diff --git a/addons/analytic_user_function/i18n/id.po b/addons/analytic_user_function/i18n/id.po
index 8accd38d181..dbed0272e64 100644
--- a/addons/analytic_user_function/i18n/id.po
+++ b/addons/analytic_user_function/i18n/id.po
@@ -6,20 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-03 02:55+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Salah dalam penyusunan format XML"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Produk"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -32,31 +32,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "Nama Obyek harus berawalan _x dan tidak mengandung karakter khusus !"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "Produk"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Akun Analisis"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -68,25 +49,35 @@ msgstr "Pengguna/Products Rel"
 msgid "User"
 msgstr "Pengguna"
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr "Tabel hubungan antara pengguna dengan produk pada akun analitik"
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr "Fungsi Pengguna Analitik"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Produk Pengguna untuk Akun Analitik ini"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "Nama Obyek harus berawalan _x dan tidak mengandung karakter khusus !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Salah dalam penyusunan format XML"
diff --git a/addons/analytic_user_function/i18n/it.po b/addons/analytic_user_function/i18n/it.po
index edfb008bf02..fce4f1132f9 100644
--- a/addons/analytic_user_function/i18n/it.po
+++ b/addons/analytic_user_function/i18n/it.po
@@ -6,25 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-24 08:06+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-11-25 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "L'ID certificato del modulo deve essere unico!"
-
-#. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Prodotto"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -37,30 +32,12 @@ msgstr "Errore !"
 msgid "Timesheet Line"
 msgstr "Linea del Timesheet"
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "Prodotto"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Conto Analitico"
 
-#. module: analytic_user_function
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere unico!"
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -84,17 +61,35 @@ msgstr ""
 msgid "Relation table between users and products on a analytic account"
 msgstr "Tabella di collegamento tra utenti e prodotti su un conto analitico"
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr "Funzione di utente analitico"
 
-#. module: analytic_user_function
-#: 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!"
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Prodotto di utente per questo conto analitico"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per Visualizzazione Architettura!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
+
+#~ 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 name of the module must be unique !"
+#~ msgstr "Il nome del modulo deve essere unico!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "L'ID certificato del modulo deve essere unico!"
diff --git a/addons/analytic_user_function/i18n/ko.po b/addons/analytic_user_function/i18n/ko.po
index cdd3b81d9b3..303ba5c4321 100644
--- a/addons/analytic_user_function/i18n/ko.po
+++ b/addons/analytic_user_function/i18n/ko.po
@@ -7,20 +7,20 @@ 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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-03 02:55+0000\n"
 "Last-Translator: Bundo <bundo@bundo.biz>\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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "상품"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -33,31 +33,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함하면 안 됩니다 !"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "상품"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "분석 계정"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -69,25 +50,35 @@ msgstr "사용자/상품 관계"
 msgid "User"
 msgstr "사용자"
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr "분석 계정 상의 사용자와 상품 간의 관계 테이블"
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr "사용자 함수 분석"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "이 분석 계정을 위한 사용자의 상품"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함하면 안 됩니다 !"
diff --git a/addons/analytic_user_function/i18n/lt.po b/addons/analytic_user_function/i18n/lt.po
index 768dfb0e6bf..3c580ff0c6d 100644
--- a/addons/analytic_user_function/i18n/lt.po
+++ b/addons/analytic_user_function/i18n/lt.po
@@ -6,19 +6,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-09-08 16:50+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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: analytic_user_function
@@ -32,31 +32,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr ""
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -68,24 +49,27 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
diff --git a/addons/analytic_user_function/i18n/mn.po b/addons/analytic_user_function/i18n/mn.po
index 8329637eb7e..1e850e2b236 100644
--- a/addons/analytic_user_function/i18n/mn.po
+++ b/addons/analytic_user_function/i18n/mn.po
@@ -7,20 +7,20 @@ 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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-10-13 07:43+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Дэлгэцийн XML алдаатай!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Бараа"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -33,33 +33,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-"болохгүй!"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "Бараа"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Аналитик данс"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -71,25 +50,37 @@ msgstr "Хэрэглэгч/Бүтээгдэхүүн"
 msgid "User"
 msgstr "Хэрэглэгч"
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr "Хэрэглэгч болон барааны аналитик дансны хамаарлын хүснэгт"
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr "Аналитик хэрэглэгчийн үүрэг"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Хэрэглэгчийн бүтээгдэхүүний аналитик данс"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Дэлгэцийн XML алдаатай!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+#~ "болохгүй!"
diff --git a/addons/analytic_user_function/i18n/nl.po b/addons/analytic_user_function/i18n/nl.po
index de86f25fbec..80c80e34399 100644
--- a/addons/analytic_user_function/i18n/nl.po
+++ b/addons/analytic_user_function/i18n/nl.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-04 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/oc.po b/addons/analytic_user_function/i18n/oc.po
index 2e7f9d18a6c..3ae951c7dd8 100644
--- a/addons/analytic_user_function/i18n/oc.po
+++ b/addons/analytic_user_function/i18n/oc.po
@@ -7,20 +7,20 @@ 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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-03 02:55+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invalid per l'arquitectura de la vista"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Produch"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -33,33 +33,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
-"especials !"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "Produch"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Compte Analitic"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -71,25 +50,37 @@ msgstr "Relacion Utilizaires/Produches"
 msgid "User"
 msgstr "Utilizaire"
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Produch de l'Utilizaire per aqueste Compte Analitic"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invalid per l'arquitectura de la vista"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+#~ "especials !"
diff --git a/addons/analytic_user_function/i18n/pl.po b/addons/analytic_user_function/i18n/pl.po
index a310cca8e68..eebc9cba768 100644
--- a/addons/analytic_user_function/i18n/pl.po
+++ b/addons/analytic_user_function/i18n/pl.po
@@ -6,20 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-01-02 01:26+0000\n"
 "Last-Translator: Jarosław Ogrodnik <nobodythere@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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -32,33 +32,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: 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: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr ""
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Konto analityczne"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -70,25 +49,37 @@ msgstr ""
 msgid "User"
 msgstr "Użytkownik"
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#~ 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 !"
diff --git a/addons/analytic_user_function/i18n/pt.po b/addons/analytic_user_function/i18n/pt.po
index c049ed9de28..e497bc782f8 100644
--- a/addons/analytic_user_function/i18n/pt.po
+++ b/addons/analytic_user_function/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-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/pt_BR.po b/addons/analytic_user_function/i18n/pt_BR.po
index b426070089a..f9b27623cb9 100644
--- a/addons/analytic_user_function/i18n/pt_BR.po
+++ b/addons/analytic_user_function/i18n/pt_BR.po
@@ -6,20 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-09-08 16:39+0000\n"
 "Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -32,33 +32,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-"especial!"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr ""
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -70,25 +49,37 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalido XML para Arquitetura da View"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
+#~ "especial!"
diff --git a/addons/analytic_user_function/i18n/ro.po b/addons/analytic_user_function/i18n/ro.po
index e00def28004..8353f9db8b0 100644
--- a/addons/analytic_user_function/i18n/ro.po
+++ b/addons/analytic_user_function/i18n/ro.po
@@ -6,20 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-03 02:56+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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invalid pentru arhitectura machetei de afișare !"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Produs"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -32,33 +32,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
-"special !"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "Produs"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Cont analitic"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -70,26 +49,38 @@ msgstr "Rel. utilizatori/produse"
 msgid "User"
 msgstr "Utilizator"
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr ""
 "Tabel de relaţii între utilizatori  şi produsele dintrun cont analitic"
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr "Funcţie analitică de utilizator"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Produsul utilizatorului pentru acest cont analitic"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invalid pentru arhitectura machetei de afișare !"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
+#~ "special !"
diff --git a/addons/analytic_user_function/i18n/ru.po b/addons/analytic_user_function/i18n/ru.po
index 4105962affa..177b1076c24 100644
--- a/addons/analytic_user_function/i18n/ru.po
+++ b/addons/analytic_user_function/i18n/ru.po
@@ -6,20 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-04-16 13:24+0000\n"
 "Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Продукт"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -32,33 +32,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "Продукт"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Счет аналитического учета"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -70,25 +49,37 @@ msgstr "Пользователь/Свяь в продукцией"
 msgid "User"
 msgstr "Пользователь"
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr "Таблица связи между пользователем и продуктом для счёта аналитики"
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr "Пользовательская функция аналитики"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Продуктв пользователей для счета аналитики"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра архитектуры!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
diff --git a/addons/analytic_user_function/i18n/sk.po b/addons/analytic_user_function/i18n/sk.po
index 8c2723f05bc..37a9c2604e4 100644
--- a/addons/analytic_user_function/i18n/sk.po
+++ b/addons/analytic_user_function/i18n/sk.po
@@ -7,20 +7,20 @@ 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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-03 02:57+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neplatné XML pre zobrazenie architektúry!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Produkt"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -33,32 +33,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Názov objektu musí začínať x_ a nesmie obsahovať žiadne špeciálne znaky!"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analytický účet"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -70,25 +50,36 @@ msgstr ""
 msgid "User"
 msgstr "Užívateľ"
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr ""
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Názov objektu musí začínať x_ a nesmie obsahovať žiadne špeciálne znaky!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neplatné XML pre zobrazenie architektúry!"
diff --git a/addons/analytic_user_function/i18n/sl.po b/addons/analytic_user_function/i18n/sl.po
index 9320dd37ec9..167d55812c6 100644
--- a/addons/analytic_user_function/i18n/sl.po
+++ b/addons/analytic_user_function/i18n/sl.po
@@ -6,25 +6,20 @@ 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:11+0000\n"
-"PO-Revision-Date: 2010-11-27 05:38+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\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-11-28 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Oznaka certifikata modula mora biti enolična!"
-
-#. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Proizvod"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -37,29 +32,12 @@ msgstr "Napaka!"
 msgid "Timesheet Line"
 msgstr "Postavka časovnice"
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "Proizvod"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analitični konto"
 
-#. module: analytic_user_function
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Ime modula mora biti enolično!"
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -82,17 +60,34 @@ msgstr ""
 msgid "Relation table between users and products on a analytic account"
 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 "Napaka! Ne morete kreirati rekurzivnih analitičnih kontov."
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr "Analitična uporabniška funkcija"
 
-#. module: analytic_user_function
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Dolžina polja ne sme biti nikoli manj od 1!"
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Uporabniški proizvodi za ta analitični konto"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Dolžina polja ne sme biti nikoli manj od 1!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Ime modula mora biti enolično!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Oznaka certifikata modula mora biti enolična!"
diff --git a/addons/analytic_user_function/i18n/sq.po b/addons/analytic_user_function/i18n/sq.po
index c47d5c2ba20..aab53be77e7 100644
--- a/addons/analytic_user_function/i18n/sq.po
+++ b/addons/analytic_user_function/i18n/sq.po
@@ -7,19 +7,19 @@ 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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-02 14:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: analytic_user_function
@@ -33,31 +33,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr ""
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -69,24 +50,27 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
diff --git a/addons/analytic_user_function/i18n/sr.po b/addons/analytic_user_function/i18n/sr.po
index cca514edd0e..ae0d2bf0593 100644
--- a/addons/analytic_user_function/i18n/sr.po
+++ b/addons/analytic_user_function/i18n/sr.po
@@ -7,20 +7,20 @@ 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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-10-27 08:09+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za pregled arhitekture"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Proizvod"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -33,33 +33,12 @@ msgstr "Greška !"
 msgid "Timesheet Line"
 msgstr "Niz Kontrolne kartice"
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "Proizvod"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analitički konto"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-"Nisu definisani troskovi naloga '\\n' za ovaj proizvod \"%s\" (sifra:%d)"
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -71,26 +50,50 @@ msgstr "Korisnik/Proizvod Relac."
 msgid "User"
 msgstr "Korisnik"
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr "Relaciona tabela izmedju korisnika i proizvoda u analitickom kontu"
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr "Korisnicka Funkcija Analitike"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-"Nisu definisani troskovi naloga '\\n' za ovaj proizvod \"%s\" (sifra:%d)"
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Korisnicki Proizvod za ovaj Analiticki Konto"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nevažeći XML za pregled arhitekture"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#, python-format
+#~ msgid ""
+#~ "There is no expense account define ' \\n                                'for "
+#~ "this product: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Nisu definisani troskovi naloga '\\n' za ovaj proizvod \"%s\" (sifra:%d)"
+
+#, python-format
+#~ msgid ""
+#~ "There is no expense account define ' \\n                                    "
+#~ "'for this product: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Nisu definisani troskovi naloga '\\n' za ovaj proizvod \"%s\" (sifra:%d)"
diff --git a/addons/analytic_user_function/i18n/sr@latin.po b/addons/analytic_user_function/i18n/sr@latin.po
index c19a4a91d31..884ddef32bd 100644
--- a/addons/analytic_user_function/i18n/sr@latin.po
+++ b/addons/analytic_user_function/i18n/sr@latin.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/sv.po b/addons/analytic_user_function/i18n/sv.po
index 2d3d98b49f7..081feb57039 100644
--- a/addons/analytic_user_function/i18n/sv.po
+++ b/addons/analytic_user_function/i18n/sv.po
@@ -6,25 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-23 09:44+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-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Produkt"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -37,29 +32,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Objekt"
 
-#. module: analytic_user_function
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -82,17 +60,22 @@ msgstr ""
 msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr "Analytic User Function"
 
-#. module: analytic_user_function
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Användarens produkt för detta objekt"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
diff --git a/addons/analytic_user_function/i18n/tlh.po b/addons/analytic_user_function/i18n/tlh.po
index b9c167c2790..df085f8dcfc 100644
--- a/addons/analytic_user_function/i18n/tlh.po
+++ b/addons/analytic_user_function/i18n/tlh.po
@@ -6,19 +6,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: analytic_user_function
@@ -32,31 +32,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr ""
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -68,24 +49,27 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po
index 0f22f005de4..734e33bd4df 100644
--- a/addons/analytic_user_function/i18n/tr.po
+++ b/addons/analytic_user_function/i18n/tr.po
@@ -6,20 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-10-30 14:34+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-10-31 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Ürün"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -32,31 +32,12 @@ msgstr "Hata !"
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "Nesne adı x_ ile başlamalı ve özel karakter içermemelidir!"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "Ürün"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analiz Hesabı"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -68,25 +49,35 @@ msgstr "Kullanıcı/Ürün İlşk."
 msgid "User"
 msgstr "Kullanıcı"
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr "İlişkili tablo analitik hesapta kullanıcılar ve ürün arasında"
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr "Analitik Kullanıcı Fonksiyonu"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Bu Analitik Hesap İçin Kullanıcının Ürünü"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "Nesne adı x_ ile başlamalı ve özel karakter içermemelidir!"
diff --git a/addons/analytic_user_function/i18n/uk.po b/addons/analytic_user_function/i18n/uk.po
index 16ec5f8fcd9..9588c3e8e36 100644
--- a/addons/analytic_user_function/i18n/uk.po
+++ b/addons/analytic_user_function/i18n/uk.po
@@ -6,20 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-02-03 08:33+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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури Вигляду!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -32,32 +32,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr ""
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -69,25 +49,36 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильний XML для Архітектури Вигляду!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
diff --git a/addons/analytic_user_function/i18n/vi.po b/addons/analytic_user_function/i18n/vi.po
index 6b2520ddbed..8f36ce67726 100644
--- a/addons/analytic_user_function/i18n/vi.po
+++ b/addons/analytic_user_function/i18n/vi.po
@@ -7,19 +7,19 @@ 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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-08-02 14:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: analytic_user_function
@@ -33,31 +33,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr ""
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -69,24 +50,27 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
diff --git a/addons/analytic_user_function/i18n/zh_CN.po b/addons/analytic_user_function/i18n/zh_CN.po
index 7ac9ae19623..e3fbdd11dfb 100644
--- a/addons/analytic_user_function/i18n/zh_CN.po
+++ b/addons/analytic_user_function/i18n/zh_CN.po
@@ -6,20 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-09-29 09:18+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "产品"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -32,31 +32,12 @@ msgstr "错误！"
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "产品"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "辅助核算项目"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -68,24 +49,27 @@ msgstr "用户/相关产品"
 msgid "User"
 msgstr "用户"
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr "用在有关系的用户和产品的辅助核算项"
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr "辅助核算用的函数"
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
@@ -112,3 +96,10 @@ msgstr "用户的产品辅助核算项目"
 #~ "    显然,如果当前的科目没有记录的数据,默认的值是作为正常科目数据,所以这模块是完全兼容旧的设置\n"
 #~ "\n"
 #~ "    "
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效XML视图结构!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
diff --git a/addons/analytic_user_function/i18n/zh_TW.po b/addons/analytic_user_function/i18n/zh_TW.po
index 5e00d3cd0c7..2a81b272b1e 100644
--- a/addons/analytic_user_function/i18n/zh_TW.po
+++ b/addons/analytic_user_function/i18n/zh_TW.po
@@ -6,19 +6,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2009-01-23 16:16+0000\n"
 "Last-Translator: <>\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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: analytic_user_function
@@ -32,31 +32,12 @@ msgstr ""
 msgid "Timesheet Line"
 msgstr ""
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr ""
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                    "
-"'for this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -68,24 +49,27 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr ""
 
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid ""
-"There is no expense account define ' \\n                                'for "
-"this product: \"%s\" (id:%d)"
-msgstr ""
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
diff --git a/addons/association/i18n/ar.po b/addons/association/i18n/ar.po
index f18d1508330..7d6442dcec0 100644
--- a/addons/association/i18n/ar.po
+++ b/addons/association/i18n/ar.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11:37+0000\n"
 "Last-Translator: <>\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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -36,12 +36,6 @@ msgstr ""
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -69,11 +63,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -86,11 +75,6 @@ msgstr ""
 msgid "Association profile"
 msgstr ""
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
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/bg.po b/addons/association/i18n/bg.po
index ebcba95775c..b1ea8bbd8df 100644
--- a/addons/association/i18n/bg.po
+++ b/addons/association/i18n/bg.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11:52+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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -36,14 +36,6 @@ msgstr ""
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-"символи!"
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -71,11 +63,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -88,11 +75,6 @@ msgstr ""
 msgid "Association profile"
 msgstr ""
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
@@ -132,3 +114,12 @@ msgstr ""
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 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 за преглед на архитектурата"
diff --git a/addons/association/i18n/bs.po b/addons/association/i18n/bs.po
index 8e2b5bcb41a..a6c0555f60d 100644
--- a/addons/association/i18n/bs.po
+++ b/addons/association/i18n/bs.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11:52+0000\n"
 "Last-Translator: Miro Glavić <glavicmiro@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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -36,13 +36,6 @@ msgstr ""
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv Objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -70,11 +63,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -87,11 +75,6 @@ msgstr ""
 msgid "Association profile"
 msgstr "Profil društva"
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
@@ -132,6 +115,11 @@ msgstr ""
 msgid "Project Management"
 msgstr "Upravljanje Projektom"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv Objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
+
 #~ msgid "Relationship Management"
 #~ msgstr "Upravljanje Odnosima"
 
@@ -147,6 +135,9 @@ msgstr "Upravljanje Projektom"
 #~ msgid "Profile for Associates"
 #~ msgstr "Profil za Članove"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+
 #~ msgid "Partner Relation & Calendars"
 #~ msgstr "Odnosi Partnera i Kalendari"
 
diff --git a/addons/association/i18n/ca.po b/addons/association/i18n/ca.po
index 85b596b62af..cf5646e261f 100644
--- a/addons/association/i18n/ca.po
+++ b/addons/association/i18n/ca.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11:37+0000\n"
 "Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -36,14 +36,6 @@ msgstr "Aconsegueix les coses acabades (GTD)"
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-"especial!"
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -71,11 +63,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -91,11 +78,6 @@ msgstr ""
 msgid "Association profile"
 msgstr "Perfil associacions"
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de model no vàlid en la definició de l'acció."
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
@@ -136,6 +118,12 @@ msgstr ""
 msgid "Project Management"
 msgstr "Gestió de projectes"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+#~ "especial!"
+
 #~ msgid "Relationship Management"
 #~ msgstr "Gestió de relacions"
 
@@ -151,6 +139,9 @@ msgstr "Gestió de projectes"
 #~ "un accés de FTP per a que els usuaris naveguin fàcilment pels documents "
 #~ "associats."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom de model no vàlid en la definició de l'acció."
+
 #~ msgid "Segmentation"
 #~ msgstr "Segmentació"
 
@@ -163,6 +154,9 @@ msgstr "Gestió de projectes"
 #~ msgid "Profile for Associates"
 #~ msgstr "Perfil per associacions"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invàlid per a la definició de la vista!"
+
 #~ msgid "Partner Relation & Calendars"
 #~ msgstr "Relacions amb empreses & Calendaris"
 
diff --git a/addons/association/i18n/cs.po b/addons/association/i18n/cs.po
index dc900975187..df0f56649b9 100644
--- a/addons/association/i18n/cs.po
+++ b/addons/association/i18n/cs.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11:51+0000\n"
 "Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -36,13 +36,6 @@ msgstr ""
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -70,11 +63,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalidní XML pro zobrazení architektury!"
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -87,11 +75,6 @@ msgstr ""
 msgid "Association profile"
 msgstr ""
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
@@ -132,6 +115,14 @@ msgstr ""
 msgid "Project Management"
 msgstr "Správa projektů"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalidní XML pro zobrazení architektury!"
+
 #~ msgid "Install"
 #~ msgstr "Instalovat"
 
diff --git a/addons/association/i18n/de.po b/addons/association/i18n/de.po
index 9ab68a63876..14bad6aa307 100644
--- a/addons/association/i18n/de.po
+++ b/addons/association/i18n/de.po
@@ -6,7 +6,7 @@ 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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-30 17:45+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,63 +14,31 @@ 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-01 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
-#. module: association
-#: help:profile.association.config.install_modules_wizard,event_project:0
-msgid "Helps you to manage and organize your events."
-msgstr ""
-"Diese Anwendung ermöglicht das Management und die Organisation von "
-"Veranstaltungen."
-
-#. module: association
-#: help:profile.association.config.install_modules_wizard,project_gtd:0
-msgid ""
-"GTD is a methodology to efficiently organise yourself and your tasks. This "
-"module fully integrates GTD principle with OpenERP's project management."
-msgstr ""
-"GTD ist eine Methode zur effizienten Organisation von Aufgaben. Dieses "
-"Module ist voll integriert mit dem openERP Projektmanagement Modul."
-
-#. module: association
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#. module: association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Ressourcenmanagement"
-
-#. module: association
-#: field:profile.association.config.install_modules_wizard,event_project:0
-msgid "Events"
-msgstr "Veranstaltungen"
-
-#. module: association
-#: 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:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Event Management"
 msgstr "Veranstaltungsmanagement"
 
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "To Do Liste (GTD)"
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+"Diese Modul ermöglicht die Erstellung eines Installationsprofils für "
+"Vereine, Verbände und Organisationen"
+
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -81,6 +49,18 @@ msgstr "Abfolge Konfiguration"
 msgid "title"
 msgstr "Bezeichnung"
 
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+"Diese Anwendung ermöglicht das Management und die Organisation von "
+"Veranstaltungen."
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr "Bild"
+
 #. module: association
 #: help:profile.association.config.install_modules_wizard,hr_expense:0
 msgid ""
@@ -90,28 +70,20 @@ msgstr ""
 "Erfassung und Management von Mitarbeiter Ausgaben, inklusive der Möglichkeit "
 "diese an Kunden weiterzuberechnen."
 
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+"GTD ist eine Methode zur effizienten Organisation von Aufgaben. Dieses "
+"Module ist voll integriert mit dem openERP Projektmanagement Modul."
+
 #. module: association
 #: model:ir.module.module,shortdesc:association.module_meta_information
 msgid "Association profile"
 msgstr "Profil Vereine & Verbände"
 
-#. module: association
-#: model:ir.module.module,description:association.module_meta_information
-msgid "This module is to create Profile for Associates"
-msgstr ""
-"Diese Modul ermöglicht die Erstellung eines Installationsprofils für "
-"Vereine, Verbände und Organisationen"
-
-#. module: association
-#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr "profile.association.config.install_modules_wizard"
-
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
@@ -119,33 +91,8 @@ msgstr "Ausgabenkontrolle"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
-#: field:profile.association.config.install_modules_wizard,project:0
-msgid "Project Management"
-msgstr "Projektmanagement"
-
-#. module: association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr "Wiki"
-
-#. module: association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr "To Do Liste (GTD)"
-
-#. module: association
-#: help:profile.association.config.install_modules_wizard,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
-msgstr ""
-"Anwendung für das Management, Planung und zeitlicher Überwachung von "
-"Projekten und Aufgaben ..."
-
-#. module: association
-#: field:profile.association.config.install_modules_wizard,config_logo:0
-msgid "Image"
-msgstr "Bild"
+msgid "Resources Management"
+msgstr "Ressourcenmanagement"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,wiki:0
@@ -157,9 +104,35 @@ msgstr ""
 "effizienten Managements Ihres Unternehmenswissens."
 
 #. module: association
-#: 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 !"
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+"Anwendung für das Management, Planung und zeitlicher Überwachung von "
+"Projekten und Aufgaben ..."
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr "profile.association.config.install_modules_wizard"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr "Veranstaltungen"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+#: field:profile.association.config.install_modules_wizard,project:0
+msgid "Project Management"
+msgstr "Projektmanagement"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
 
 #~ msgid "Relationship Management"
 #~ msgstr "Beziehungsmanagement"
@@ -187,6 +160,9 @@ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
 #~ msgid "Profile for Associates"
 #~ msgstr "Profile für Vereinigungen"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "Partner Relation & Calendars"
 #~ msgstr "Partner Verbindungen & Kalender"
 
@@ -216,3 +192,15 @@ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
 
 #~ msgid "Cancel"
 #~ msgstr "Abbrechen"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ 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 !"
diff --git a/addons/association/i18n/el.po b/addons/association/i18n/el.po
index 52a25ad9760..674dbfec791 100644
--- a/addons/association/i18n/el.po
+++ b/addons/association/i18n/el.po
@@ -7,66 +7,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-30 17:20+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-01 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Το όνομα του Αντικειμένου πρέπει να ξεκινά με x_ και να μην περιέχει "
-"ειδικούς χαρακτήρες"
-
-#. module: association
-#: help:profile.association.config.install_modules_wizard,event_project:0
-msgid "Helps you to manage and organize your events."
-msgstr "Σε βοηθά να διαχειριστείς και να οργανώσεις τα γεγονότα σου."
-
-#. module: association
-#: help:profile.association.config.install_modules_wizard,project_gtd:0
-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
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Το όνομα του αρθρώματος πρέπει να είναι μοναδικό !"
-
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
-
-#. module: association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Διαχείριση Πόρων"
-
-#. module: association
-#: field:profile.association.config.install_modules_wizard,event_project:0
-msgid "Events"
-msgstr "Γεγονότα"
-
-#. module: association
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Το πιστοποιητικό ταυτότητας του στοιχείου πρέπει να είναι μοναδικό"
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Event Management"
 msgstr "Διαχείριση Γεγονότων"
 
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Getting Things Done"
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -77,6 +47,16 @@ msgstr "Πρόοδος Παραμετροποίησης"
 msgid "title"
 msgstr "τίτλος"
 
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr "Σε βοηθά να διαχειριστείς και να οργανώσεις τα γεγονότα σου."
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr "Εικόνα"
+
 #. module: association
 #: help:profile.association.config.install_modules_wizard,hr_expense:0
 msgid ""
@@ -86,26 +66,18 @@ msgstr ""
 "Καταγράφει και διαχειρίζεται τα έξοδα των υπαλλήλων, και μπορεί αυτόματα να "
 "επανατιμολογήσει τους πελάτες  εάν τα έξοδα είναι σχετιζόμενα με έργο."
 
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+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
 #: model:ir.module.module,shortdesc:association.module_meta_information
 msgid "Association profile"
 msgstr ""
 
-#. module: association
-#: model:ir.module.module,description:association.module_meta_information
-msgid "This module is to create Profile for Associates"
-msgstr ""
-
-#. module: association
-#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Μη έγκυρο  ΧML για Προβολή Αρχιτεκτονικής!"
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
@@ -113,19 +85,15 @@ msgstr "Παρακολούθηση Εξόδων"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
-#: field:profile.association.config.install_modules_wizard,project:0
-msgid "Project Management"
-msgstr "Διαχείριση Έργων"
+msgid "Resources Management"
+msgstr "Διαχείριση Πόρων"
 
 #. module: association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr "Wiki"
-
-#. module: association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr "Getting Things Done"
+#: help:profile.association.config.install_modules_wizard,wiki:0
+msgid ""
+"Lets you create wiki pages and page groups in order to keep track of "
+"business knowledge and share it with and  between your employees."
+msgstr ""
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project:0
@@ -136,18 +104,38 @@ msgstr ""
 "Βοηθά στην παρακολούθηση των έργων και εργασιών παράγωντας σχέδια , κλπ..."
 
 #. module: association
-#: field:profile.association.config.install_modules_wizard,config_logo:0
-msgid "Image"
-msgstr "Εικόνα"
-
-#. module: association
-#: help:profile.association.config.install_modules_wizard,wiki:0
-msgid ""
-"Lets you create wiki pages and page groups in order to keep track of "
-"business knowledge and share it with and  between your employees."
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
 msgstr ""
 
 #. module: association
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Το μέγεθος του πεδίου δε μπορεί ποτέ να είναι μικρότερο από 1!"
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr "Γεγονότα"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+#: field:profile.association.config.install_modules_wizard,project:0
+msgid "Project Management"
+msgstr "Διαχείριση Έργων"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Το όνομα του Αντικειμένου πρέπει να ξεκινά με x_ και να μην περιέχει "
+#~ "ειδικούς χαρακτήρες"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Το όνομα του αρθρώματος πρέπει να είναι μοναδικό !"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Το πιστοποιητικό ταυτότητας του στοιχείου πρέπει να είναι μοναδικό"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Μη έγκυρο  ΧML για Προβολή Αρχιτεκτονικής!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Το μέγεθος του πεδίου δε μπορεί ποτέ να είναι μικρότερο από 1!"
diff --git a/addons/association/i18n/es.po b/addons/association/i18n/es.po
index a522860bf04..6fda184afc2 100644
--- a/addons/association/i18n/es.po
+++ b/addons/association/i18n/es.po
@@ -6,7 +6,7 @@ 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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-25 08:39+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,62 +14,29 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-26 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: association
-#: help:profile.association.config.install_modules_wizard,event_project:0
-msgid "Helps you to manage and organize your events."
-msgstr "Le ayuda a gestionar y organizar sus eventos."
-
-#. module: association
-#: help:profile.association.config.install_modules_wizard,project_gtd:0
-msgid ""
-"GTD is a methodology to efficiently organise yourself and your tasks. This "
-"module fully integrates GTD principle with OpenERP's project management."
-msgstr ""
-"GTD (consigue hacer el trabajo) es una metodología para organizarse "
-"eficazmente usted mismo y sus tareas. Este módulo integra completamente el "
-"principio GTD con la gestión de proyectos de OpenERP."
-
-#. module: association
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
-#. module: association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Gestión de recursos"
-
-#. module: association
-#: field:profile.association.config.install_modules_wizard,event_project:0
-msgid "Events"
-msgstr "Eventos"
-
-#. module: association
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Event Management"
 msgstr "Gestión de eventos"
 
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Conseguir Hacer el Trabajo"
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr "Este módulo sirve para crear perfiles para asociados"
+
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -80,6 +47,16 @@ msgstr "Progreso configuración"
 msgid "title"
 msgstr "título"
 
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr "Le ayuda a gestionar y organizar sus eventos."
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
 #. module: association
 #: help:profile.association.config.install_modules_wizard,hr_expense:0
 msgid ""
@@ -90,26 +67,21 @@ msgstr ""
 "clientes de forma automática si los gastos están relacionados con un "
 "proyecto."
 
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+"GTD (consigue hacer el trabajo) es una metodología para organizarse "
+"eficazmente usted mismo y sus tareas. Este módulo integra completamente el "
+"principio GTD con la gestión de proyectos de OpenERP."
+
 #. module: association
 #: model:ir.module.module,shortdesc:association.module_meta_information
 msgid "Association profile"
 msgstr "Perfil asociación"
 
-#. module: association
-#: model:ir.module.module,description:association.module_meta_information
-msgid "This module is to create Profile for Associates"
-msgstr "Este módulo sirve para crear perfiles para asociados"
-
-#. module: association
-#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr "perfil.asociacion.config.asistente_instal_modulos"
-
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
@@ -117,33 +89,8 @@ msgstr "Seguimiento de gastos"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
-#: field:profile.association.config.install_modules_wizard,project:0
-msgid "Project Management"
-msgstr "Gestión de proyectos"
-
-#. module: association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr "Wiki"
-
-#. module: association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr "Conseguir Hacer el Trabajo"
-
-#. module: association
-#: help:profile.association.config.install_modules_wizard,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
-msgstr ""
-"Le ayuda a gestionar sus proyectos y tareas realizando un seguimiento de los "
-"mismos, generando planificaciones, ..."
-
-#. module: association
-#: field:profile.association.config.install_modules_wizard,config_logo:0
-msgid "Image"
-msgstr "Imagen"
+msgid "Resources Management"
+msgstr "Gestión de recursos"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,wiki:0
@@ -155,9 +102,35 @@ msgstr ""
 "conocimiento del negocio y compartirlo con y entre sus empleados."
 
 #. module: association
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+"Le ayuda a gestionar sus proyectos y tareas realizando un seguimiento de los "
+"mismos, generando planificaciones, ..."
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr "perfil.asociacion.config.asistente_instal_modulos"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr "Eventos"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+#: field:profile.association.config.install_modules_wizard,project:0
+msgid "Project Management"
+msgstr "Gestión de proyectos"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
 
 #~ msgid "Relationship Management"
 #~ msgstr "Gestión de relaciones"
@@ -174,6 +147,9 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 #~ "acceso de FTP para que los usuarios naveguen fácilmente en los documentos "
 #~ "asociados."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
 #~ msgid "Segmentation"
 #~ msgstr "Segmentación"
 
@@ -186,6 +162,9 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 #~ msgid "Profile for Associates"
 #~ msgstr "Perfil para asociados"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "Partner Relation & Calendars"
 #~ msgstr "Relaciones de empresa y calendarios"
 
@@ -215,3 +194,12 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 
 #~ msgid "Cancel"
 #~ msgstr "Cancelar"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/association/i18n/et.po b/addons/association/i18n/et.po
index 10812852345..6cc24cbada1 100644
--- a/addons/association/i18n/et.po
+++ b/addons/association/i18n/et.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11:49+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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -36,13 +36,6 @@ msgstr "Saa asjad tehtud"
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: 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: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -70,11 +63,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -89,11 +77,6 @@ msgstr ""
 msgid "Association profile"
 msgstr "Ühingu profiil"
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
@@ -134,6 +117,11 @@ msgstr ""
 msgid "Project Management"
 msgstr "Projektihaldus"
 
+#~ 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 "Relationship Management"
 #~ msgstr "Suhete haldus"
 
@@ -148,6 +136,9 @@ msgstr "Projektihaldus"
 #~ "(sisemised dokumendid, prinditud aruandeid, kalendrisüsteemi). See avab "
 #~ "kasutajatele FTP ligipääsu, et lihtsalt sirvida ühingu dokumente."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
+
 #~ msgid "Segmentation"
 #~ msgstr "Segmenteerimine"
 
@@ -160,6 +151,9 @@ msgstr "Projektihaldus"
 #~ msgid "Profile for Associates"
 #~ msgstr "Profiil ühingutele"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Vigane XML vaate arhitektuurile!"
+
 #~ msgid "Partner Relation & Calendars"
 #~ msgstr "Partneri seos ja kalendrid"
 
diff --git a/addons/association/i18n/fr.po b/addons/association/i18n/fr.po
index baf99f29c6b..ad263775ff6 100644
--- a/addons/association/i18n/fr.po
+++ b/addons/association/i18n/fr.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-05 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
diff --git a/addons/association/i18n/hr.po b/addons/association/i18n/hr.po
index f18d1508330..7d6442dcec0 100644
--- a/addons/association/i18n/hr.po
+++ b/addons/association/i18n/hr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11:37+0000\n"
 "Last-Translator: <>\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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -36,12 +36,6 @@ msgstr ""
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -69,11 +63,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -86,11 +75,6 @@ msgstr ""
 msgid "Association profile"
 msgstr ""
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
diff --git a/addons/association/i18n/hu.po b/addons/association/i18n/hu.po
index f18d1508330..7d6442dcec0 100644
--- a/addons/association/i18n/hu.po
+++ b/addons/association/i18n/hu.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11:37+0000\n"
 "Last-Translator: <>\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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -36,12 +36,6 @@ msgstr ""
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -69,11 +63,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -86,11 +75,6 @@ msgstr ""
 msgid "Association profile"
 msgstr ""
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
diff --git a/addons/association/i18n/id.po b/addons/association/i18n/id.po
index f18d1508330..7d6442dcec0 100644
--- a/addons/association/i18n/id.po
+++ b/addons/association/i18n/id.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11:37+0000\n"
 "Last-Translator: <>\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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -36,12 +36,6 @@ msgstr ""
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -69,11 +63,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -86,11 +75,6 @@ msgstr ""
 msgid "Association profile"
 msgstr ""
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
diff --git a/addons/association/i18n/it.po b/addons/association/i18n/it.po
index eaae1c45b8b..1f68b77b4ed 100644
--- a/addons/association/i18n/it.po
+++ b/addons/association/i18n/it.po
@@ -6,69 +6,36 @@ 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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-22 07:37+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-11-23 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
-
-#. module: association
-#: help:profile.association.config.install_modules_wizard,event_project:0
-msgid "Helps you to manage and organize your events."
-msgstr "Aiuta a gestire e organizzare gli eventi."
-
-#. module: association
-#: help:profile.association.config.install_modules_wizard,project_gtd:0
-msgid ""
-"GTD is a methodology to efficiently organise yourself and your tasks. This "
-"module fully integrates GTD principle with OpenERP's project management."
-msgstr ""
-"GTD (Getting Things Done) è un metodo efficiente per organizzare sè stessi e "
-"le propie attività. Questo modulo integra pienamente i principi del GTD con "
-"il modulo di Gestione Progetti di OpenERP."
-
-#. module: association
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere unico!"
-
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome di modulo non valido nella definizione dell'azione."
-
-#. module: association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Gestione Risorse"
-
-#. module: association
-#: field:profile.association.config.install_modules_wizard,event_project:0
-msgid "Events"
-msgstr "Eventi"
-
-#. module: association
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "L'ID certificato del modulo deve essere unico!"
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Event Management"
 msgstr "Gestione Eventi"
 
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Getting Things Done (GTD)"
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -79,6 +46,16 @@ msgstr ""
 msgid "title"
 msgstr "titolo"
 
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr "Aiuta a gestire e organizzare gli eventi."
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr "Imagine"
+
 #. module: association
 #: help:profile.association.config.install_modules_wizard,hr_expense:0
 msgid ""
@@ -86,26 +63,21 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+"GTD (Getting Things Done) è un metodo efficiente per organizzare sè stessi e "
+"le propie attività. Questo modulo integra pienamente i principi del GTD con "
+"il modulo di Gestione Progetti di OpenERP."
+
 #. module: association
 #: model:ir.module.module,shortdesc:association.module_meta_information
 msgid "Association profile"
 msgstr ""
 
-#. module: association
-#: model:ir.module.module,description:association.module_meta_information
-msgid "This module is to create Profile for Associates"
-msgstr ""
-
-#. module: association
-#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr "profile.association.config.install_modules_wizard"
-
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
@@ -113,31 +85,8 @@ msgstr "Monitoraggio spese"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
-#: field:profile.association.config.install_modules_wizard,project:0
-msgid "Project Management"
-msgstr "Gestione progetti"
-
-#. module: association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr "Wiki"
-
-#. module: association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr "Getting Things Done (GTD)"
-
-#. module: association
-#: help:profile.association.config.install_modules_wizard,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
-msgstr ""
-
-#. module: association
-#: field:profile.association.config.install_modules_wizard,config_logo:0
-msgid "Image"
-msgstr "Imagine"
+msgid "Resources Management"
+msgstr "Gestione Risorse"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,wiki:0
@@ -147,9 +96,33 @@ msgid ""
 msgstr ""
 
 #. module: association
-#: 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!"
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr "profile.association.config.install_modules_wizard"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr "Eventi"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+#: field:profile.association.config.install_modules_wizard,project:0
+msgid "Project Management"
+msgstr "Gestione progetti"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
 
 #~ msgid "Relationship Management"
 #~ msgstr "Gestione deile Relazioni"
@@ -166,12 +139,18 @@ msgstr "La dimensione del campo non può mai essere minore di 1!"
 #~ "sistema). Esso apre un accesso FTP per gli utenti per meglio sfogliare i "
 #~ "documenti associati."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome di modulo non valido nella definizione dell'azione."
+
 #~ msgid "Segmentation"
 #~ msgstr "Segmentazione"
 
 #~ msgid "Document Management"
 #~ msgstr "Gestione documenti"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per Visualizzazione Architettura!"
+
 #~ msgid "Install"
 #~ msgstr "Installa"
 
@@ -189,3 +168,12 @@ msgstr "La dimensione del campo non può mai essere minore di 1!"
 
 #~ msgid "Cancel"
 #~ msgstr "Annulla"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Il nome del modulo deve essere unico!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "L'ID certificato 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/association/i18n/ko.po b/addons/association/i18n/ko.po
index 1b8c7650a05..c6fe2278173 100644
--- a/addons/association/i18n/ko.po
+++ b/addons/association/i18n/ko.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11:47+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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -37,12 +37,6 @@ msgstr ""
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -70,11 +64,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -88,11 +77,6 @@ msgstr ""
 msgid "Association profile"
 msgstr "협회 프로파일"
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
diff --git a/addons/association/i18n/lt.po b/addons/association/i18n/lt.po
index 993afba3f75..644f6b30258 100644
--- a/addons/association/i18n/lt.po
+++ b/addons/association/i18n/lt.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11:38+0000\n"
 "Last-Translator: <>\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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -36,12 +36,6 @@ msgstr ""
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -69,11 +63,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -86,11 +75,6 @@ msgstr ""
 msgid "Association profile"
 msgstr ""
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
diff --git a/addons/association/i18n/nl.po b/addons/association/i18n/nl.po
index 4a259a7ca1f..72e63cb38f6 100644
--- a/addons/association/i18n/nl.po
+++ b/addons/association/i18n/nl.po
@@ -6,68 +6,36 @@ 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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-24 09:43+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-11-25 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
-#: 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 karakters bevatten !"
-
-#. module: association
-#: help:profile.association.config.install_modules_wizard,event_project:0
-msgid "Helps you to manage and organize your events."
-msgstr "Helpt bij het beheren en organiseren van evenementen."
-
-#. module: association
-#: help:profile.association.config.install_modules_wizard,project_gtd:0
-msgid ""
-"GTD is a methodology to efficiently organise yourself and your tasks. This "
-"module fully integrates GTD principle with OpenERP's project management."
-msgstr ""
-"GTD is een methode om uzelf en uw taken efficiënt te beheren. Deze module "
-"integreert de GTD-uitgangspunten naadloos in OpenERP's projectmanagement "
-"module."
-
-#. module: association
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "De modulenaam moet uniek zijn !"
-
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de actie definitie."
-
-#. module: association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Resourcebeheer"
-
-#. module: association
-#: field:profile.association.config.install_modules_wizard,event_project:0
-msgid "Events"
-msgstr "Evenementen"
-
-#. module: association
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Event Management"
 msgstr "Evenementenbeheer"
 
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Getting Things Done (dingen gedaan krijgen)"
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr "Deze module is voor het maken van een vereniging profiel"
+
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -78,6 +46,16 @@ msgstr "Configuratievoortgang"
 msgid "title"
 msgstr "titel"
 
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr "Helpt bij het beheren en organiseren van evenementen."
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr "Afbeelding"
+
 #. module: association
 #: help:profile.association.config.install_modules_wizard,hr_expense:0
 msgid ""
@@ -87,26 +65,21 @@ msgstr ""
 "Beheert medewerker declaraties en kan automatisch doorberekenen aan klanten "
 "als de uitgave project-gerelateerd is."
 
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+"GTD is een methode om uzelf en uw taken efficiënt te beheren. Deze module "
+"integreert de GTD-uitgangspunten naadloos in OpenERP's projectmanagement "
+"module."
+
 #. module: association
 #: model:ir.module.module,shortdesc:association.module_meta_information
 msgid "Association profile"
 msgstr "Vereniging profiel"
 
-#. module: association
-#: model:ir.module.module,description:association.module_meta_information
-msgid "This module is to create Profile for Associates"
-msgstr "Deze module is voor het maken van een vereniging profiel"
-
-#. module: association
-#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr "profile.association.config.install_modules_wizard"
-
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor overzicht"
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
@@ -114,33 +87,8 @@ msgstr "Declaratiebeheer"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
-#: field:profile.association.config.install_modules_wizard,project:0
-msgid "Project Management"
-msgstr "Projectmanagement"
-
-#. module: association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr "Wiki"
-
-#. module: association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr "Getting Things Done (dingen gedaan krijgen)"
-
-#. module: association
-#: help:profile.association.config.install_modules_wizard,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
-msgstr ""
-"Helpt uw projecten en taken te beheren door ze te volgen, planningen te "
-"genereren, etc..."
-
-#. module: association
-#: field:profile.association.config.install_modules_wizard,config_logo:0
-msgid "Image"
-msgstr "Afbeelding"
+msgid "Resources Management"
+msgstr "Resourcebeheer"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,wiki:0
@@ -152,9 +100,49 @@ msgstr ""
 "te delen met en tussen uw medewerkers."
 
 #. module: association
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+"Helpt uw projecten en taken te beheren door ze te volgen, planningen te "
+"genereren, etc..."
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr "profile.association.config.install_modules_wizard"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr "Evenementen"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+#: field:profile.association.config.install_modules_wizard,project:0
+msgid "Project Management"
+msgstr "Projectmanagement"
+
+#~ 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 karakters bevatten !"
 
 #~ msgid "Profile for Associates"
 #~ msgstr "Profiel voor verenigingen"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML voor overzicht"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "De modulenaam moet uniek zijn !"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ongeldige modelnaam in de actie definitie."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/association/i18n/pl.po b/addons/association/i18n/pl.po
index 48a527e766b..c4ecffef74b 100644
--- a/addons/association/i18n/pl.po
+++ b/addons/association/i18n/pl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11:46+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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -36,14 +36,6 @@ msgstr ""
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: 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: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -71,11 +63,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -88,11 +75,6 @@ msgstr ""
 msgid "Association profile"
 msgstr ""
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
@@ -132,3 +114,12 @@ msgstr ""
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr ""
+
+#~ 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!"
diff --git a/addons/association/i18n/pt.po b/addons/association/i18n/pt.po
index 3ec514b09ff..c5f31b919c0 100644
--- a/addons/association/i18n/pt.po
+++ b/addons/association/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-05 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
diff --git a/addons/association/i18n/pt_BR.po b/addons/association/i18n/pt_BR.po
index 7cdac33eb46..ba1c54a1afe 100644
--- a/addons/association/i18n/pt_BR.po
+++ b/addons/association/i18n/pt_BR.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-04 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
diff --git a/addons/association/i18n/ro.po b/addons/association/i18n/ro.po
index 993afba3f75..644f6b30258 100644
--- a/addons/association/i18n/ro.po
+++ b/addons/association/i18n/ro.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11:38+0000\n"
 "Last-Translator: <>\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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -36,12 +36,6 @@ msgstr ""
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -69,11 +63,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -86,11 +75,6 @@ msgstr ""
 msgid "Association profile"
 msgstr ""
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
diff --git a/addons/association/i18n/ru.po b/addons/association/i18n/ru.po
index 6cff73442ea..7842172bde8 100644
--- a/addons/association/i18n/ru.po
+++ b/addons/association/i18n/ru.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11:44+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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -36,14 +36,6 @@ msgstr ""
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -71,11 +63,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -88,11 +75,6 @@ msgstr ""
 msgid "Association profile"
 msgstr ""
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
@@ -132,3 +114,12 @@ msgstr ""
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 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 для просмотра архитектуры!"
diff --git a/addons/association/i18n/sl.po b/addons/association/i18n/sl.po
index 11bbf1f602b..06794f9a990 100644
--- a/addons/association/i18n/sl.po
+++ b/addons/association/i18n/sl.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-11-12 11:44+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\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-11-13 04:57+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
@@ -36,22 +36,15 @@ msgstr ""
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
-
 #. 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
@@ -61,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
@@ -70,11 +63,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -87,11 +75,6 @@ msgstr ""
 msgid "Association profile"
 msgstr ""
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Napačno ime modela v definiciji dejanja."
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
@@ -124,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
@@ -132,15 +115,26 @@ msgstr ""
 msgid "Project Management"
 msgstr "Upravljanje projektov"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
+
 #~ msgid "Relationship Management"
 #~ msgstr "Upravljanje povezav"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Napačno ime modela v definiciji dejanja."
+
 #~ msgid "Segmentation"
 #~ msgstr "Razčlenjenost"
 
 #~ msgid "Document Management"
 #~ msgstr "Upravljanje dokumentov"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda."
+
 #~ msgid "Install"
 #~ msgstr "Namesti"
 
diff --git a/addons/association/i18n/sq.po b/addons/association/i18n/sq.po
index 33ca2c91031..4e4b3af9dda 100644
--- a/addons/association/i18n/sq.po
+++ b/addons/association/i18n/sq.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -37,12 +37,6 @@ msgstr ""
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -70,11 +64,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -87,11 +76,6 @@ msgstr ""
 msgid "Association profile"
 msgstr ""
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
diff --git a/addons/association/i18n/sr.po b/addons/association/i18n/sr.po
index 4356f6c83bb..bb60a2e579b 100644
--- a/addons/association/i18n/sr.po
+++ b/addons/association/i18n/sr.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-14 08:01+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-15 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -37,13 +37,6 @@ msgstr "Da Zavrsimo"
 msgid "This module is to create Profile for Associates"
 msgstr "Ovaj modul ima namenu da kreira Profil za Asociacije"
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -73,11 +66,6 @@ msgstr ""
 "Prati i upravlja troskovima zaposlenih, i moze da automatski re-fakturise "
 "klijente ukoliko su troskovi vezani za projekat."
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neispravan XML za pregled arhitekture!"
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -92,11 +80,6 @@ msgstr ""
 msgid "Association profile"
 msgstr "Profil Asociacije"
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Neispravno ime u definiciji akcije."
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
@@ -140,3 +123,14 @@ msgstr "Dogadjaji"
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr "Upravljanje Projektima"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neispravno ime u definiciji akcije."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neispravan XML za pregled arhitekture!"
diff --git a/addons/association/i18n/sr@latin.po b/addons/association/i18n/sr@latin.po
index ea347c6cbab..d63c2e0e8af 100644
--- a/addons/association/i18n/sr@latin.po
+++ b/addons/association/i18n/sr@latin.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-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
diff --git a/addons/association/i18n/sv.po b/addons/association/i18n/sv.po
index 153d1a6edbd..5c8200cd83b 100644
--- a/addons/association/i18n/sv.po
+++ b/addons/association/i18n/sv.po
@@ -6,68 +6,36 @@ 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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-12-01 09:44+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-02 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#. module: association
-#: help:profile.association.config.install_modules_wizard,event_project:0
-msgid "Helps you to manage and organize your events."
-msgstr ""
-
-#. module: association
-#: help:profile.association.config.install_modules_wizard,project_gtd:0
-msgid ""
-"GTD is a methodology to efficiently organise yourself and your tasks. This "
-"module fully integrates GTD principle with OpenERP's project management."
-msgstr ""
-"GTD (Getting things done) är en metod för att effektivt organisera dig själv "
-"och dina uppgifter. Denna modul ingår en fullständig implementation av GTD-"
-"principen i samklang med projektmodulen."
-
-#. module: association
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Namnet på modulen måste vara unikt!"
-
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Felaktigt namn för modell i händelsedefinitionen."
-
-#. module: association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Resursadministration"
-
-#. module: association
-#: field:profile.association.config.install_modules_wizard,event_project:0
-msgid "Events"
-msgstr ""
-
-#. module: association
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Certifikat ID för modulen måste vara unik!"
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Event Management"
 msgstr ""
 
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -78,6 +46,16 @@ msgstr "Konfigurationsförlopp"
 msgid "title"
 msgstr "titel"
 
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
 #. module: association
 #: help:profile.association.config.install_modules_wizard,hr_expense:0
 msgid ""
@@ -85,26 +63,21 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+"GTD (Getting things done) är en metod för att effektivt organisera dig själv "
+"och dina uppgifter. Denna modul ingår en fullständig implementation av GTD-"
+"principen i samklang med projektmodulen."
+
 #. module: association
 #: model:ir.module.module,shortdesc:association.module_meta_information
 msgid "Association profile"
 msgstr ""
 
-#. module: association
-#: model:ir.module.module,description:association.module_meta_information
-msgid "This module is to create Profile for Associates"
-msgstr ""
-
-#. module: association
-#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Felaktig XML för Vyarkitektur!"
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
@@ -112,18 +85,14 @@ msgstr ""
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
-#: field:profile.association.config.install_modules_wizard,project:0
-msgid "Project Management"
-msgstr "Projekthantering"
+msgid "Resources Management"
+msgstr "Resursadministration"
 
 #. module: association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr "Wiki"
-
-#. module: association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
+#: help:profile.association.config.install_modules_wizard,wiki:0
+msgid ""
+"Lets you create wiki pages and page groups in order to keep track of "
+"business knowledge and share it with and  between your employees."
 msgstr ""
 
 #. module: association
@@ -134,18 +103,34 @@ msgid ""
 msgstr ""
 
 #. module: association
-#: field:profile.association.config.install_modules_wizard,config_logo:0
-msgid "Image"
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
 msgstr ""
 
 #. module: association
-#: help:profile.association.config.install_modules_wizard,wiki:0
-msgid ""
-"Lets you create wiki pages and page groups in order to keep track of "
-"business knowledge and share it with and  between your employees."
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
 msgstr ""
 
 #. module: association
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
+#: view:profile.association.config.install_modules_wizard:0
+#: field:profile.association.config.install_modules_wizard,project:0
+msgid "Project Management"
+msgstr "Projekthantering"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Namnet på modulen måste vara unikt!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Felaktigt namn för modell i händelsedefinitionen."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Certifikat ID för modulen måste vara unik!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Felaktig XML för Vyarkitektur!"
diff --git a/addons/association/i18n/tlh.po b/addons/association/i18n/tlh.po
index 993afba3f75..644f6b30258 100644
--- a/addons/association/i18n/tlh.po
+++ b/addons/association/i18n/tlh.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11:38+0000\n"
 "Last-Translator: <>\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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -36,12 +36,6 @@ msgstr ""
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -69,11 +63,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -86,11 +75,6 @@ msgstr ""
 msgid "Association profile"
 msgstr ""
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
diff --git a/addons/association/i18n/tr.po b/addons/association/i18n/tr.po
index c61b794515f..9f4c00760d2 100644
--- a/addons/association/i18n/tr.po
+++ b/addons/association/i18n/tr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11: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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -36,12 +36,6 @@ msgstr ""
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -69,11 +63,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -86,11 +75,6 @@ msgstr ""
 msgid "Association profile"
 msgstr "Şirket Profili"
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
@@ -137,5 +121,8 @@ msgstr "Proje Yönetimi"
 #~ msgid "Association Profile : Install Extra Modules"
 #~ msgstr "Şirket Profili : Install Extra Modules"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
+
 #~ msgid "Cancel"
 #~ msgstr "İptal"
diff --git a/addons/association/i18n/uk.po b/addons/association/i18n/uk.po
index e8c1da169bc..8e8ad33928e 100644
--- a/addons/association/i18n/uk.po
+++ b/addons/association/i18n/uk.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11: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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -36,13 +36,6 @@ msgstr ""
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -70,11 +63,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури Вигляду!"
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -87,11 +75,6 @@ msgstr ""
 msgid "Association profile"
 msgstr ""
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
@@ -131,3 +114,11 @@ msgstr ""
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 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 для Архітектури Вигляду!"
diff --git a/addons/association/i18n/vi.po b/addons/association/i18n/vi.po
index ed590b89fa5..2b0bf6e3497 100644
--- a/addons/association/i18n/vi.po
+++ b/addons/association/i18n/vi.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-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -37,12 +37,6 @@ msgstr ""
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -70,11 +64,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -87,11 +76,6 @@ msgstr ""
 msgid "Association profile"
 msgstr ""
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
diff --git a/addons/association/i18n/zh_CN.po b/addons/association/i18n/zh_CN.po
index 7757044be38..a54cb948f03 100644
--- a/addons/association/i18n/zh_CN.po
+++ b/addons/association/i18n/zh_CN.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11:42+0000\n"
 "Last-Translator: mga (Open ERP) <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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -36,12 +36,6 @@ msgstr ""
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -69,11 +63,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -86,11 +75,6 @@ msgstr ""
 msgid "Association profile"
 msgstr ""
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
@@ -131,6 +115,10 @@ msgstr ""
 msgid "Project Management"
 msgstr "项目管理"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+
 #~ msgid ""
 #~ "The Document Management System of Open ERP allows you to store, browse, "
 #~ "automatically index, search and preview all kind of documents (internal "
@@ -140,12 +128,18 @@ msgstr "项目管理"
 #~ "Open ERP的单据管理系统，运行你保存、浏览、自动索引、搜索和预览所有单据（包括内部单据、打印报表、日历系统）。It opens an FTP "
 #~ "access for the users to easily browse association's document."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "操作定义中使用了无效的模式名称。"
+
 #~ msgid "Segmentation"
 #~ msgstr "细分"
 
 #~ msgid "Document Management"
 #~ msgstr "文档管理"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效XML视图结构!"
+
 #~ msgid "Install"
 #~ msgstr "安装"
 
diff --git a/addons/association/i18n/zh_TW.po b/addons/association/i18n/zh_TW.po
index 4c179225ffa..fbf3c18553f 100644
--- a/addons/association/i18n/zh_TW.po
+++ b/addons/association/i18n/zh_TW.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
 "PO-Revision-Date: 2010-11-12 11:39+0000\n"
 "Last-Translator: <>\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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -36,12 +36,6 @@ msgstr ""
 msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: association
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
@@ -69,11 +63,6 @@ msgid ""
 "clients if the expenses are project-related."
 msgstr ""
 
-#. module: association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
@@ -86,11 +75,6 @@ msgstr ""
 msgid "Association profile"
 msgstr ""
 
-#. module: association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
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/ar.po b/addons/auction/i18n/ar.po
index f60e546a948..77621278e0f 100644
--- a/addons/auction/i18n/ar.po
+++ b/addons/auction/i18n/ar.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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
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/bg.po b/addons/auction/i18n/bg.po
index 5e1ced29124..d49cfa059e8 100644
--- a/addons/auction/i18n/bg.po
+++ b/addons/auction/i18n/bg.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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/bs.po b/addons/auction/i18n/bs.po
index 0d347a300a1..4b330f4407f 100644
--- a/addons/auction/i18n/bs.po
+++ b/addons/auction/i18n/bs.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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/ca.po b/addons/auction/i18n/ca.po
index c317c09d137..7c459b651de 100644
--- a/addons/auction/i18n/ca.po
+++ b/addons/auction/i18n/ca.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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/cs.po b/addons/auction/i18n/cs.po
index 2bb882debd3..f0e77de84fd 100644
--- a/addons/auction/i18n/cs.po
+++ b/addons/auction/i18n/cs.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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/de.po b/addons/auction/i18n/de.po
index 015fa63d4f7..15f1fde14e0 100644
--- a/addons/auction/i18n/de.po
+++ b/addons/auction/i18n/de.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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/el.po b/addons/auction/i18n/el.po
index 13fae3a7caa..a91ee9f4ab6 100644
--- a/addons/auction/i18n/el.po
+++ b/addons/auction/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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/es.po b/addons/auction/i18n/es.po
index b99610ad62b..16dece1585d 100644
--- a/addons/auction/i18n/es.po
+++ b/addons/auction/i18n/es.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/es_AR.po b/addons/auction/i18n/es_AR.po
index dd59b8324c6..6d583c7dfef 100644
--- a/addons/auction/i18n/es_AR.po
+++ b/addons/auction/i18n/es_AR.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/es_EC.po b/addons/auction/i18n/es_EC.po
index 1a604682c79..4344c8b7c3d 100644
--- a/addons/auction/i18n/es_EC.po
+++ b/addons/auction/i18n/es_EC.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/et.po b/addons/auction/i18n/et.po
index 23d050bb301..a76f15abfbc 100644
--- a/addons/auction/i18n/et.po
+++ b/addons/auction/i18n/et.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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/fi.po b/addons/auction/i18n/fi.po
index 33f67f93658..b30502aa996 100644
--- a/addons/auction/i18n/fi.po
+++ b/addons/auction/i18n/fi.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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/fr.po b/addons/auction/i18n/fr.po
index af136b90e88..607cd91e4d8 100644
--- a/addons/auction/i18n/fr.po
+++ b/addons/auction/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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/hi.po b/addons/auction/i18n/hi.po
index 68872074565..6a5b7144d4e 100644
--- a/addons/auction/i18n/hi.po
+++ b/addons/auction/i18n/hi.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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/hr.po b/addons/auction/i18n/hr.po
index 2c9aff09051..69047880933 100644
--- a/addons/auction/i18n/hr.po
+++ b/addons/auction/i18n/hr.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/hu.po b/addons/auction/i18n/hu.po
index f60e546a948..77621278e0f 100644
--- a/addons/auction/i18n/hu.po
+++ b/addons/auction/i18n/hu.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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/id.po b/addons/auction/i18n/id.po
index d39c4efa32c..1e06984bcbc 100644
--- a/addons/auction/i18n/id.po
+++ b/addons/auction/i18n/id.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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/it.po b/addons/auction/i18n/it.po
index 6573403247d..0dbb994be4d 100644
--- a/addons/auction/i18n/it.po
+++ b/addons/auction/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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/ko.po b/addons/auction/i18n/ko.po
index e69649bd817..0d6eeb03987 100644
--- a/addons/auction/i18n/ko.po
+++ b/addons/auction/i18n/ko.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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/lt.po b/addons/auction/i18n/lt.po
index c0469efcc3e..22eef1ac006 100644
--- a/addons/auction/i18n/lt.po
+++ b/addons/auction/i18n/lt.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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/nl.po b/addons/auction/i18n/nl.po
index 8a3777c3032..d4c27cc6ebb 100644
--- a/addons/auction/i18n/nl.po
+++ b/addons/auction/i18n/nl.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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/nl_BE.po b/addons/auction/i18n/nl_BE.po
index 3bf72375630..d5cb9477271 100644
--- a/addons/auction/i18n/nl_BE.po
+++ b/addons/auction/i18n/nl_BE.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/pl.po b/addons/auction/i18n/pl.po
index 9c68c7876e8..fc8c7a7d8c0 100644
--- a/addons/auction/i18n/pl.po
+++ b/addons/auction/i18n/pl.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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/pt.po b/addons/auction/i18n/pt.po
index 4d271e7af8c..08517226b3a 100644
--- a/addons/auction/i18n/pt.po
+++ b/addons/auction/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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/pt_BR.po b/addons/auction/i18n/pt_BR.po
index cd829a979e3..253ff6956da 100644
--- a/addons/auction/i18n/pt_BR.po
+++ b/addons/auction/i18n/pt_BR.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/ro.po b/addons/auction/i18n/ro.po
index a383a2a3915..9868a60c748 100644
--- a/addons/auction/i18n/ro.po
+++ b/addons/auction/i18n/ro.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/ru.po b/addons/auction/i18n/ru.po
index 1f7c08892b4..6d3abb51b29 100644
--- a/addons/auction/i18n/ru.po
+++ b/addons/auction/i18n/ru.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/sl.po b/addons/auction/i18n/sl.po
index c63b68ed3d0..c9d7ef69c65 100644
--- a/addons/auction/i18n/sl.po
+++ b/addons/auction/i18n/sl.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/sq.po b/addons/auction/i18n/sq.po
index ddbdf769dc8..eb247e1b93f 100644
--- a/addons/auction/i18n/sq.po
+++ b/addons/auction/i18n/sq.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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/sr.po b/addons/auction/i18n/sr.po
index 8a1cd2a8b59..514596aa097 100644
--- a/addons/auction/i18n/sr.po
+++ b/addons/auction/i18n/sr.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/sr@latin.po b/addons/auction/i18n/sr@latin.po
index 438667b3df2..0f9c3810cfa 100644
--- a/addons/auction/i18n/sr@latin.po
+++ b/addons/auction/i18n/sr@latin.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/sv.po b/addons/auction/i18n/sv.po
index f92a01c1af5..15a95d2778c 100644
--- a/addons/auction/i18n/sv.po
+++ b/addons/auction/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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/tlh.po b/addons/auction/i18n/tlh.po
index 83b213eb096..f718b1ef8fa 100644
--- a/addons/auction/i18n/tlh.po
+++ b/addons/auction/i18n/tlh.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/tr.po b/addons/auction/i18n/tr.po
index ad770b9580f..ac1cd891849 100644
--- a/addons/auction/i18n/tr.po
+++ b/addons/auction/i18n/tr.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/uk.po b/addons/auction/i18n/uk.po
index 269995edfbc..0aea2c7e45f 100644
--- a/addons/auction/i18n/uk.po
+++ b/addons/auction/i18n/uk.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/vi.po b/addons/auction/i18n/vi.po
index 42a1071d4a0..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-14 05:24+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/i18n/zh_CN.po b/addons/auction/i18n/zh_CN.po
index be3e8185103..c843c44fed1 100644
--- a/addons/auction/i18n/zh_CN.po
+++ b/addons/auction/i18n/zh_CN.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/zh_TW.po b/addons/auction/i18n/zh_TW.po
index 3bf1f0f4482..40fa4071d3f 100644
--- a/addons/auction/i18n/zh_TW.po
+++ b/addons/auction/i18n/zh_TW.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
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/ar.po b/addons/audittrail/i18n/ar.po
index 73cbe69fd4a..eadeed5cf0d 100644
--- a/addons/audittrail/i18n/ar.po
+++ b/addons/audittrail/i18n/ar.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
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/bg.po b/addons/audittrail/i18n/bg.po
index 5cdc3e99e02..4f27099ec19 100644
--- a/addons/audittrail/i18n/bg.po
+++ b/addons/audittrail/i18n/bg.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/bs.po b/addons/audittrail/i18n/bs.po
index edde587bbbf..69e5a51d159 100644
--- a/addons/audittrail/i18n/bs.po
+++ b/addons/audittrail/i18n/bs.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/ca.po b/addons/audittrail/i18n/ca.po
index e1977e5150e..186ec8ac1b8 100644
--- a/addons/audittrail/i18n/ca.po
+++ b/addons/audittrail/i18n/ca.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/cs.po b/addons/audittrail/i18n/cs.po
index 73cbe69fd4a..eadeed5cf0d 100644
--- a/addons/audittrail/i18n/cs.po
+++ b/addons/audittrail/i18n/cs.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/de.po b/addons/audittrail/i18n/de.po
index 4136af88c3d..f95f3e3340f 100644
--- a/addons/audittrail/i18n/de.po
+++ b/addons/audittrail/i18n/de.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/el.po b/addons/audittrail/i18n/el.po
index 9559d33b500..c8587eca4a0 100644
--- a/addons/audittrail/i18n/el.po
+++ b/addons/audittrail/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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/es.po b/addons/audittrail/i18n/es.po
index 47a42b7c6e6..bee22014acf 100644
--- a/addons/audittrail/i18n/es.po
+++ b/addons/audittrail/i18n/es.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/es_AR.po b/addons/audittrail/i18n/es_AR.po
index 334eaabdd44..91b88ed2a97 100644
--- a/addons/audittrail/i18n/es_AR.po
+++ b/addons/audittrail/i18n/es_AR.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/es_EC.po b/addons/audittrail/i18n/es_EC.po
index f7e7b54d385..420f15f8f62 100644
--- a/addons/audittrail/i18n/es_EC.po
+++ b/addons/audittrail/i18n/es_EC.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/et.po b/addons/audittrail/i18n/et.po
index 7c176728c7a..3a11034351e 100644
--- a/addons/audittrail/i18n/et.po
+++ b/addons/audittrail/i18n/et.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/fr.po b/addons/audittrail/i18n/fr.po
index 1f9d8301315..a2fe30bd192 100644
--- a/addons/audittrail/i18n/fr.po
+++ b/addons/audittrail/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-12 08:06+0000\n"
-"Last-Translator: swinter <Unknown>\n"
+"PO-Revision-Date: 2010-12-14 23: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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/hr.po b/addons/audittrail/i18n/hr.po
index 9852125bf76..a5e1a110495 100644
--- a/addons/audittrail/i18n/hr.po
+++ b/addons/audittrail/i18n/hr.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/hu.po b/addons/audittrail/i18n/hu.po
index 73cbe69fd4a..fe692f9623f 100644
--- a/addons/audittrail/i18n/hu.po
+++ b/addons/audittrail/i18n/hu.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/id.po b/addons/audittrail/i18n/id.po
index 6a510404677..1e322c31ad8 100644
--- a/addons/audittrail/i18n/id.po
+++ b/addons/audittrail/i18n/id.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/it.po b/addons/audittrail/i18n/it.po
index 7906181d1fd..e52cbed1fb4 100644
--- a/addons/audittrail/i18n/it.po
+++ b/addons/audittrail/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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/ko.po b/addons/audittrail/i18n/ko.po
index 517acfdd419..1d5cfb41435 100644
--- a/addons/audittrail/i18n/ko.po
+++ b/addons/audittrail/i18n/ko.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/lt.po b/addons/audittrail/i18n/lt.po
index 58929baf9f1..d7812ec5c97 100644
--- a/addons/audittrail/i18n/lt.po
+++ b/addons/audittrail/i18n/lt.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/mn.po b/addons/audittrail/i18n/mn.po
index c11fac7f9e6..626d98eaf24 100644
--- a/addons/audittrail/i18n/mn.po
+++ b/addons/audittrail/i18n/mn.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/nl.po b/addons/audittrail/i18n/nl.po
index 67f4187cfb9..57848070b45 100644
--- a/addons/audittrail/i18n/nl.po
+++ b/addons/audittrail/i18n/nl.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/nl_BE.po b/addons/audittrail/i18n/nl_BE.po
index bf9736509be..c44bd4f89cd 100644
--- a/addons/audittrail/i18n/nl_BE.po
+++ b/addons/audittrail/i18n/nl_BE.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/oc.po b/addons/audittrail/i18n/oc.po
index 676f6703cb8..5541a951023 100644
--- a/addons/audittrail/i18n/oc.po
+++ b/addons/audittrail/i18n/oc.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/pl.po b/addons/audittrail/i18n/pl.po
index f2d91802707..407490ee9fd 100644
--- a/addons/audittrail/i18n/pl.po
+++ b/addons/audittrail/i18n/pl.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/pt.po b/addons/audittrail/i18n/pt.po
index 77b814aa4c1..2c0370a9307 100644
--- a/addons/audittrail/i18n/pt.po
+++ b/addons/audittrail/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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/pt_BR.po b/addons/audittrail/i18n/pt_BR.po
index 667a9494932..3ca78c1a5dc 100644
--- a/addons/audittrail/i18n/pt_BR.po
+++ b/addons/audittrail/i18n/pt_BR.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/ro.po b/addons/audittrail/i18n/ro.po
index 6c91bd68799..ba6bc84bb1e 100644
--- a/addons/audittrail/i18n/ro.po
+++ b/addons/audittrail/i18n/ro.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/ru.po b/addons/audittrail/i18n/ru.po
index 8214d55dabe..e1b6f66d77a 100644
--- a/addons/audittrail/i18n/ru.po
+++ b/addons/audittrail/i18n/ru.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/sl.po b/addons/audittrail/i18n/sl.po
index 5ca5dc128f0..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-14 05:27+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/i18n/sq.po b/addons/audittrail/i18n/sq.po
index d23ba0f69ac..dfd6181b7cd 100644
--- a/addons/audittrail/i18n/sq.po
+++ b/addons/audittrail/i18n/sq.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/sr@latin.po b/addons/audittrail/i18n/sr@latin.po
index be12f5c1939..42d8c43f684 100644
--- a/addons/audittrail/i18n/sr@latin.po
+++ b/addons/audittrail/i18n/sr@latin.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/sv.po b/addons/audittrail/i18n/sv.po
index f0ef4e18d2f..8b778153478 100644
--- a/addons/audittrail/i18n/sv.po
+++ b/addons/audittrail/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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/tlh.po b/addons/audittrail/i18n/tlh.po
index 657b179a955..7d28a11be47 100644
--- a/addons/audittrail/i18n/tlh.po
+++ b/addons/audittrail/i18n/tlh.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/tr.po b/addons/audittrail/i18n/tr.po
index 931fb506d15..ceb0afa069c 100644
--- a/addons/audittrail/i18n/tr.po
+++ b/addons/audittrail/i18n/tr.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/uk.po b/addons/audittrail/i18n/uk.po
index 30877213c8c..99144964851 100644
--- a/addons/audittrail/i18n/uk.po
+++ b/addons/audittrail/i18n/uk.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/vi.po b/addons/audittrail/i18n/vi.po
index af295be77ef..40c943fe5dc 100644
--- a/addons/audittrail/i18n/vi.po
+++ b/addons/audittrail/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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po
index abb8ef787e0..3dfb77169f8 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/i18n/zh_CN.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/zh_TW.po b/addons/audittrail/i18n/zh_TW.po
index b11ade24b7e..48838d21e87 100644
--- a/addons/audittrail/i18n/zh_TW.po
+++ b/addons/audittrail/i18n/zh_TW.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
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/bs.po b/addons/base_action_rule/i18n/bs.po
index 2eda0368d52..3ee10952219 100644
--- a/addons/base_action_rule/i18n/bs.po
+++ b/addons/base_action_rule/i18n/bs.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/de.po b/addons/base_action_rule/i18n/de.po
index 3ced6208e2c..3e92f492259 100644
--- a/addons/base_action_rule/i18n/de.po
+++ b/addons/base_action_rule/i18n/de.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/es.po b/addons/base_action_rule/i18n/es.po
index c4347144357..52a5a368210 100644
--- a/addons/base_action_rule/i18n/es.po
+++ b/addons/base_action_rule/i18n/es.po
@@ -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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/fr.po b/addons/base_action_rule/i18n/fr.po
index b82969c71c6..a97e22f34b0 100644
--- a/addons/base_action_rule/i18n/fr.po
+++ b/addons/base_action_rule/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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/hu.po b/addons/base_action_rule/i18n/hu.po
index a0685357f18..5307bfa8317 100644
--- a/addons/base_action_rule/i18n/hu.po
+++ b/addons/base_action_rule/i18n/hu.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/it.po b/addons/base_action_rule/i18n/it.po
index d9ed55f6cd4..5449471a39e 100644
--- a/addons/base_action_rule/i18n/it.po
+++ b/addons/base_action_rule/i18n/it.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/mn.po b/addons/base_action_rule/i18n/mn.po
index 8e4f34bff0f..18749ca0872 100644
--- a/addons/base_action_rule/i18n/mn.po
+++ b/addons/base_action_rule/i18n/mn.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/nl.po b/addons/base_action_rule/i18n/nl.po
index fc301b4f5cc..fd6507b64e2 100644
--- a/addons/base_action_rule/i18n/nl.po
+++ b/addons/base_action_rule/i18n/nl.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/pt.po b/addons/base_action_rule/i18n/pt.po
index ba9b862f823..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-11 15:40+0000\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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
@@ -51,7 +51,7 @@ msgstr "Objeto"
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_email:0
 msgid "Mail to these Emails"
-msgstr ""
+msgstr "Enviar mensagem para estes endereços"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_state:0
@@ -66,7 +66,7 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Body"
-msgstr ""
+msgstr "Conteúdo da mensagem"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -139,7 +139,7 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Reminders"
-msgstr ""
+msgstr "Lembretes por correio eletrónico"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -248,7 +248,7 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,act_method:0
 msgid "Call Object Method"
-msgstr ""
+msgstr "Chamar o método do objeto"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_email_to:0
@@ -358,7 +358,7 @@ msgstr ""
 #. module: base_action_rule
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "Erro: A mensagem não está bem formatada"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -378,7 +378,7 @@ msgstr ""
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_body:0
 msgid "Content of mail"
-msgstr ""
+msgstr "Conteúdo da mensagem"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_user_id:0
@@ -398,7 +398,7 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_body:0
 msgid "Mail body"
-msgstr ""
+msgstr "Corpo da mensagem"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_remind_user:0
diff --git a/addons/base_action_rule/i18n/ru.po b/addons/base_action_rule/i18n/ru.po
index 4d9ad83de68..8ac11f24690 100644
--- a/addons/base_action_rule/i18n/ru.po
+++ b/addons/base_action_rule/i18n/ru.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/sr.po b/addons/base_action_rule/i18n/sr.po
index 5e8f714bf05..81b73f8234c 100644
--- a/addons/base_action_rule/i18n/sr.po
+++ b/addons/base_action_rule/i18n/sr.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/sr@latin.po b/addons/base_action_rule/i18n/sr@latin.po
index ede9de8725f..66f9d3f8203 100644
--- a/addons/base_action_rule/i18n/sr@latin.po
+++ b/addons/base_action_rule/i18n/sr@latin.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/sv.po b/addons/base_action_rule/i18n/sv.po
index 283208462d5..87db7715fea 100644
--- a/addons/base_action_rule/i18n/sv.po
+++ b/addons/base_action_rule/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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/zh_CN.po b/addons/base_action_rule/i18n/zh_CN.po
index 2c3bff5d92e..4f12df87d1c 100644
--- a/addons/base_action_rule/i18n/zh_CN.po
+++ b/addons/base_action_rule/i18n/zh_CN.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+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/bs.po b/addons/base_calendar/i18n/bs.po
index b37e96826d0..2448c7d4952 100644
--- a/addons/base_calendar/i18n/bs.po
+++ b/addons/base_calendar/i18n/bs.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-29 09:49+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vinteh\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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: BOSNIA AND HERZEGOVINA\n"
 "Language: hr\n"
@@ -44,9 +44,8 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,vtimezone:0
-#: field:calendar.todo,vtimezone:0
-msgid "Timezone"
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
 
 #. module: base_calendar
@@ -186,8 +185,8 @@ msgid "Indicats whether the favor of a reply is requested"
 msgstr ""
 
 #. module: base_calendar
-#: model:ir.model,name:base_calendar.model_ir_attachment
-msgid "ir.attachment"
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
 msgstr ""
 
 #. module: base_calendar
@@ -220,6 +219,11 @@ msgstr ""
 msgid "Tue"
 msgstr ""
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
@@ -227,12 +231,6 @@ msgstr ""
 msgid "Yearly"
 msgstr ""
 
-#. module: base_calendar
-#: selection:calendar.alarm,trigger_related:0
-#: selection:res.alarm,trigger_related:0
-msgid "The event ends"
-msgstr ""
-
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
@@ -259,10 +257,9 @@ msgid "Days"
 msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "No Repeat"
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
 msgstr ""
 
 #. module: base_calendar
@@ -323,10 +320,9 @@ msgid "Secondly"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.alarm,event_date:0
-#: field:calendar.attendee,event_date:0
-#: view:calendar.event:0
-msgid "Event Date"
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
 msgstr ""
 
 #. module: base_calendar
@@ -436,11 +432,6 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
-#. module: base_calendar
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nepravilno ime modela u definiciji radnje."
-
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Confirm"
@@ -581,21 +572,11 @@ msgstr ""
 msgid "Delegrated To"
 msgstr ""
 
-#. module: base_calendar
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr ""
-
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required Reply"
 msgstr ""
 
-#. module: base_calendar
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nepravilan XML format za Arhitekturu Prikaza!"
-
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
@@ -685,6 +666,12 @@ msgstr ""
 msgid "Privacy"
 msgstr ""
 
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr ""
+
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Subject"
@@ -801,9 +788,9 @@ msgid "Fri"
 msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-#: view:calendar.event:0
-msgid "Invitation Detail"
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Count can not be Negative"
 msgstr ""
 
 #. module: base_calendar
@@ -833,23 +820,11 @@ msgstr ""
 msgid "Attachment"
 msgstr ""
 
-#. module: base_calendar
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation From"
 msgstr ""
 
-#. module: base_calendar
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
-
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,alarm_id:0
@@ -922,8 +897,10 @@ msgid "June"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.alarm,alarm_id:0
-msgid "Basic Alarm"
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
 msgstr ""
 
 #. module: base_calendar
@@ -982,6 +959,13 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr ""
+
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
@@ -1035,6 +1019,12 @@ msgstr ""
 msgid "Wednesday"
 msgstr ""
 
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Interval can not be Negative"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.alarm,name:0
 #: view:calendar.event:0
@@ -1118,6 +1108,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: base_calendar
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.alarm,state:0
 #: view:calendar.attendee:0
@@ -1286,9 +1281,8 @@ msgid "Month"
 msgstr ""
 
 #. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-#: view:calendar.event:0
-msgid "Invite People"
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
 msgstr ""
 
 #. module: base_calendar
@@ -1349,6 +1343,12 @@ msgstr ""
 msgid "ir.values"
 msgstr ""
 
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr ""
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_model
 msgid "Objects"
@@ -1568,8 +1568,10 @@ msgid "Duration"
 msgstr ""
 
 #. module: base_calendar
-#: selection:base_calendar.invite.attendee,type:0
-msgid "External Email"
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid ""
+"Create specific calendar alarms that can be assigned to calendar events or "
+"meetings."
 msgstr ""
 
 #. module: base_calendar
@@ -1590,3 +1592,14 @@ msgstr ""
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
 msgstr ""
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nepravilno ime modela u definiciji radnje."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nepravilan XML format za Arhitekturu Prikaza!"
diff --git a/addons/base_calendar/i18n/de.po b/addons/base_calendar/i18n/de.po
index fecef2c0ed1..05d92dfa3f2 100644
--- a/addons/base_calendar/i18n/de.po
+++ b/addons/base_calendar/i18n/de.po
@@ -6,7 +6,7 @@ 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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-30 12:13+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -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-01 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -44,10 +44,9 @@ msgstr ""
 "wiederkehrenden Terminen im Kalender."
 
 #. module: base_calendar
-#: field:calendar.event,vtimezone:0
-#: field:calendar.todo,vtimezone:0
-msgid "Timezone"
-msgstr "Zeitzone"
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event.edit.all,name:0
@@ -258,11 +257,10 @@ msgid "Days"
 msgstr "Tage"
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "No Repeat"
-msgstr "Keine Wiederholung"
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr "Details Einladung"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:0
@@ -434,11 +432,6 @@ msgstr "Bearbeite alle Termine"
 msgid "Attendees"
 msgstr "Teilnehmer"
 
-#. module: base_calendar
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Fehler in Datenmodell der definierten Aktion"
-
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Confirm"
@@ -466,11 +459,6 @@ msgstr "Einladungstyp"
 msgid "Reminder details"
 msgstr "Details Erinnerung"
 
-#. module: base_calendar
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: base_calendar
 #: field:calendar.attendee,parent_ids:0
 msgid "Delegrated From"
@@ -508,11 +496,6 @@ msgstr "EMail"
 msgid "Event Detail"
 msgstr "Termin Detail"
 
-#. module: base_calendar
-#: 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 !"
-
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Run"
@@ -589,21 +572,11 @@ msgstr "Do"
 msgid "Delegrated To"
 msgstr "Delegiert an"
 
-#. module: base_calendar
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr "Fehlerhafte Einträge"
-
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required Reply"
 msgstr "Erwarte Rückmeldung"
 
-#. module: base_calendar
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter XML Quellcode für Ansicht"
-
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
@@ -693,6 +666,12 @@ msgstr "1ster"
 msgid "Privacy"
 msgstr "Vertraulichkeit"
 
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr "Zeitzone"
+
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Subject"
@@ -811,10 +790,10 @@ msgid "Fri"
 msgstr "Fr"
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-#: view:calendar.event:0
-msgid "Invitation Detail"
-msgstr "Details Einladung"
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Count can not be Negative"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
@@ -843,22 +822,11 @@ msgstr "Entwurf"
 msgid "Attachment"
 msgstr "Anhang"
 
-#. module: base_calendar
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler ! Sie können keine rekursiven Einträge im Menü vornehmen"
-
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation From"
 msgstr "Einladung von"
 
-#. module: base_calendar
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "Das Objekt muss mit x_ beginnen und darf keine Sonderzeichen haben !"
-
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,alarm_id:0
@@ -995,6 +963,13 @@ msgstr "Mo"
 msgid "Count"
 msgstr "Anzahl"
 
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr "Keine Wiederholung"
+
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
@@ -1048,6 +1023,12 @@ msgstr "Intervalle"
 msgid "Wednesday"
 msgstr "Mittwoch"
 
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Interval can not be Negative"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.alarm,name:0
 #: view:calendar.event:0
@@ -1135,6 +1116,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr "Wiederk. Vorgang"
 
+#. module: base_calendar
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.alarm,state:0
 #: view:calendar.attendee:0
@@ -1198,11 +1184,6 @@ msgstr "res.users"
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#. module: base_calendar
-#: 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 !"
-
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Procedure"
@@ -1637,3 +1618,28 @@ msgstr "Samstag"
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
 msgstr "5ter"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Fehler in Datenmodell der definierten Aktion"
+
+#~ msgid "Invalid arguments"
+#~ msgstr "Fehlerhafte Einträge"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter XML Quellcode für Ansicht"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler ! Sie können keine rekursiven Einträge im Menü vornehmen"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "Das Objekt muss mit x_ beginnen und darf keine Sonderzeichen haben !"
+
+#~ 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 "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/base_calendar/i18n/el.po b/addons/base_calendar/i18n/el.po
index f32f8a2e950..2a2a82dd237 100644
--- a/addons/base_calendar/i18n/el.po
+++ b/addons/base_calendar/i18n/el.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:11+0000\n"
-"PO-Revision-Date: 2010-11-23 09:30+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+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-11-24 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -44,10 +44,11 @@ msgstr ""
 "επαναλαμβανόμενο πρόσθετο ημερολογίου."
 
 #. module: base_calendar
-#: field:calendar.event,vtimezone:0
-#: field:calendar.todo,vtimezone:0
-msgid "Timezone"
-msgstr "Ζώνη ώρας"
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Η επιλεγμένη εταιρία δεν είναι στις επιτρεπόμενες εταιρίες γι' αυτόν τον "
+"χρήστη"
 
 #. module: base_calendar
 #: field:calendar.event.edit.all,name:0
@@ -223,7 +224,7 @@ msgstr "Τρι"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
@@ -258,11 +259,10 @@ msgid "Days"
 msgstr "Μέρες"
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "No Repeat"
-msgstr "Χωρίς Επανάληψη"
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr "Λεπτομέρειες Πρόσκλησης"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:0
@@ -436,11 +436,6 @@ msgstr "Επεξεργασία όλων των γεγονότων"
 msgid "Attendees"
 msgstr "Παρεβρισκόμενοι"
 
-#. module: base_calendar
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
-
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Confirm"
@@ -468,11 +463,6 @@ msgstr "Τύπος Πρόσκλησης"
 msgid "Reminder details"
 msgstr "Λεπτομέρειες Υπενθύμισης"
 
-#. module: base_calendar
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Το όνομα της υπομονάδας πρέπει να είναι μοναδικό!"
-
 #. module: base_calendar
 #: field:calendar.attendee,parent_ids:0
 msgid "Delegrated From"
@@ -510,11 +500,6 @@ msgstr "Email"
 msgid "Event Detail"
 msgstr "Λεπτομέρειες γεγονότος"
 
-#. module: base_calendar
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Run"
@@ -591,21 +576,11 @@ msgstr "Πεμπ"
 msgid "Delegrated To"
 msgstr "Εξουσιοδότηση σε"
 
-#. module: base_calendar
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr "Μη έγκυροι παράμετροι"
-
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required Reply"
 msgstr "Απαιτούμενη Απάντηση"
 
-#. module: base_calendar
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Μη έγκυρο XML για προβολή Αρχιτεκτονικής"
-
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
@@ -696,6 +671,12 @@ msgstr "Πρώτο"
 msgid "Privacy"
 msgstr "Απόρρητο"
 
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr "Ζώνη ώρας"
+
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Subject"
@@ -812,10 +793,10 @@ msgid "Fri"
 msgstr "Παρ"
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-#: view:calendar.event:0
-msgid "Invitation Detail"
-msgstr "Λεπτομέρειες Πρόσκλησης"
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Count can not be Negative"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
@@ -844,24 +825,11 @@ msgstr "Πρόχειρο"
 msgid "Attachment"
 msgstr "Επισύναψη"
 
-#. module: base_calendar
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Λάθος! Δεν μπορείτε να δημιουργήσετε κενό Μενού."
-
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation From"
 msgstr "Πρόσκληση Από"
 
-#. module: base_calendar
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Το όνομα του Αντικειμένου πρέπει να ξεκινά με x_ και να μην περιέχει "
-"ειδικούς χαρακτήρες!"
-
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,alarm_id:0
@@ -896,7 +864,7 @@ msgstr ""
 #: field:calendar.alarm,repeat:0
 #: field:res.alarm,repeat:0
 msgid "Repeat"
-msgstr ""
+msgstr "Επαναλαμβανόμενη"
 
 #. module: base_calendar
 #: help:calendar.attendee,dir:0
@@ -996,6 +964,13 @@ msgstr "Δευ"
 msgid "Count"
 msgstr "Υπολόγισε"
 
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr "Χωρίς Επανάληψη"
+
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
@@ -1049,6 +1024,12 @@ msgstr "Διάστημα"
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Interval can not be Negative"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.alarm,name:0
 #: view:calendar.event:0
@@ -1087,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
@@ -1097,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
@@ -1107,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
@@ -1125,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
@@ -1132,6 +1115,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: base_calendar
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Δεν μπορεί να υπάρχουν δύο χρήστες με το ίδιο όνομα!"
+
 #. module: base_calendar
 #: field:calendar.alarm,state:0
 #: view:calendar.attendee:0
@@ -1140,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
@@ -1193,17 +1181,12 @@ msgstr ""
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Tuesday"
-msgstr ""
-
-#. module: base_calendar
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
+msgstr "Τρίτη"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Procedure"
-msgstr ""
+msgstr "Διαδικασία"
 
 #. module: base_calendar
 #: help:calendar.alarm,description:0
@@ -1216,7 +1199,7 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Υπεύθυνος Χρήστης"
 
 #. module: base_calendar
 #: selection:calendar.attendee,availability:0
@@ -1224,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
@@ -1244,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
@@ -1264,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
@@ -1287,7 +1270,7 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Details"
-msgstr ""
+msgstr "Λεπτομέρειες"
 
 #. module: base_calendar
 #: help:calendar.event,exrule:0
@@ -1302,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
@@ -1331,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
@@ -1371,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
@@ -1616,3 +1599,24 @@ msgstr ""
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Μη έγκυρο XML για προβολή Αρχιτεκτονικής"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Το όνομα της υπομονάδας πρέπει να είναι μοναδικό!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
+
+#~ msgid "Invalid arguments"
+#~ msgstr "Μη έγκυροι παράμετροι"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Το όνομα του Αντικειμένου πρέπει να ξεκινά με x_ και να μην περιέχει "
+#~ "ειδικούς χαρακτήρες!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Λάθος! Δεν μπορείτε να δημιουργήσετε κενό Μενού."
diff --git a/addons/base_calendar/i18n/es.po b/addons/base_calendar/i18n/es.po
index 5efb351e596..44dd4c3552e 100644
--- a/addons/base_calendar/i18n/es.po
+++ b/addons/base_calendar/i18n/es.po
@@ -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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
diff --git a/addons/base_calendar/i18n/fr.po b/addons/base_calendar/i18n/fr.po
index e730abd9647..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-04 05:16+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/i18n/hr.po b/addons/base_calendar/i18n/hr.po
index 9c77318a1f0..38f9a5b76a6 100644
--- a/addons/base_calendar/i18n/hr.po
+++ b/addons/base_calendar/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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-09 07:22+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -44,10 +44,9 @@ msgstr ""
 "komponentu kalendara"
 
 #. module: base_calendar
-#: field:calendar.event,vtimezone:0
-#: field:calendar.todo,vtimezone:0
-msgid "Timezone"
-msgstr "Vremenska zona"
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event.edit.all,name:0
@@ -186,9 +185,9 @@ msgid "Indicats whether the favor of a reply is requested"
 msgstr "Indikator da li se očekuje odgovor"
 
 #. module: base_calendar
-#: model:ir.model,name:base_calendar.model_ir_attachment
-msgid "ir.attachment"
-msgstr "ir.attachment"
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr "Osnovni alarm"
 
 #. module: base_calendar
 #: help:calendar.attendee,delegated_to:0
@@ -220,6 +219,11 @@ msgstr "Prikaži vrijeme kao"
 msgid "Tue"
 msgstr "Uto"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
@@ -227,12 +231,6 @@ msgstr "Uto"
 msgid "Yearly"
 msgstr "Godišnje"
 
-#. module: base_calendar
-#: selection:calendar.alarm,trigger_related:0
-#: selection:res.alarm,trigger_related:0
-msgid "The event ends"
-msgstr "Događaj završava"
-
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
@@ -259,11 +257,10 @@ msgid "Days"
 msgstr "Dana"
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "No Repeat"
-msgstr "Bez ponavljanja"
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr "Detalji poziva"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:0
@@ -323,11 +320,10 @@ msgid "Secondly"
 msgstr "Drugo"
 
 #. module: base_calendar
-#: field:calendar.alarm,event_date:0
-#: field:calendar.attendee,event_date:0
-#: view:calendar.event:0
-msgid "Event Date"
-msgstr "Datum događaja"
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr "Događaj završava"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -436,11 +432,6 @@ msgstr "Uredi sve događaje"
 msgid "Attendees"
 msgstr "Sudionici"
 
-#. module: base_calendar
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Neispravan naziv modela u definiciji akcije"
-
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Confirm"
@@ -581,21 +572,11 @@ msgstr "Čet"
 msgid "Delegrated To"
 msgstr "Proslijeđeno"
 
-#. module: base_calendar
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr "Neispravni argumenti"
-
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required Reply"
 msgstr "Očekivan odgovor"
 
-#. module: base_calendar
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neispravan XML za arhitekturu View-a"
-
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
@@ -685,6 +666,12 @@ msgstr "Prvi"
 msgid "Privacy"
 msgstr "Privatnost"
 
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr "Vremenska zona"
+
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Subject"
@@ -801,10 +788,10 @@ msgid "Fri"
 msgstr "Pet"
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-#: view:calendar.event:0
-msgid "Invitation Detail"
-msgstr "Detalji poziva"
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Count can not be Negative"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
@@ -833,23 +820,11 @@ msgstr "Nacrt"
 msgid "Attachment"
 msgstr "Privitak"
 
-#. module: base_calendar
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Pogreška ! Ne možete kreirati rekurzivne izbornike."
-
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation From"
 msgstr "Poziv od"
 
-#. module: base_calendar
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta mora počinjati s x_ i ne smije sadržavati posebne znakove !"
-
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,alarm_id:0
@@ -922,9 +897,11 @@ msgid "June"
 msgstr "Lipanj"
 
 #. module: base_calendar
-#: field:calendar.alarm,alarm_id:0
-msgid "Basic Alarm"
-msgstr "Osnovni alarm"
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+msgstr "Datum događaja"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
@@ -982,6 +959,13 @@ msgstr "Pon"
 msgid "Count"
 msgstr "Broj"
 
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr "Bez ponavljanja"
+
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
@@ -1035,6 +1019,12 @@ msgstr "Razdoblje"
 msgid "Wednesday"
 msgstr "Srijeda"
 
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Interval can not be Negative"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.alarm,name:0
 #: view:calendar.event:0
@@ -1122,6 +1112,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr "Ponavljajući ID datuma"
 
+#. module: base_calendar
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.alarm,state:0
 #: view:calendar.attendee:0
@@ -1294,10 +1289,9 @@ msgid "Month"
 msgstr "Mjesec"
 
 #. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-#: view:calendar.event:0
-msgid "Invite People"
-msgstr "Pozovi"
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
+msgstr "Vanjska e-pošta"
 
 #. module: base_calendar
 #: help:calendar.event,rrule:0
@@ -1360,6 +1354,12 @@ msgstr "Stani"
 msgid "ir.values"
 msgstr ""
 
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr "Pozovi"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_model
 msgid "Objects"
@@ -1586,9 +1586,11 @@ msgid "Duration"
 msgstr "Trajanje"
 
 #. module: base_calendar
-#: selection:base_calendar.invite.attendee,type:0
-msgid "External Email"
-msgstr "Vanjska e-pošta"
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid ""
+"Create specific calendar alarms that can be assigned to calendar events or "
+"meetings."
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_date:0
@@ -1614,9 +1616,26 @@ msgstr "Peti"
 #~ msgstr ""
 #~ "Definira pravilo ili ponavljajući uzorak za iznimku u skupu ponavljanja"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neispravan naziv modela u definiciji akcije"
+
+#~ msgid "Invalid arguments"
+#~ msgstr "Neispravni argumenti"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neispravan XML za arhitekturu View-a"
+
 #~ msgid "Select data for ExRule"
 #~ msgstr "Odaberi podatke za pravilo iznimke"
 
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Pogreška ! Ne možete kreirati rekurzivne izbornike."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta mora počinjati s x_ i ne smije sadržavati posebne znakove !"
+
 #~ msgid "ExRule"
 #~ msgstr "Pravilo iznimke"
 
diff --git a/addons/base_calendar/i18n/it.po b/addons/base_calendar/i18n/it.po
index ece36623c88..a8c85b9eaaf 100644
--- a/addons/base_calendar/i18n/it.po
+++ b/addons/base_calendar/i18n/it.po
@@ -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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
diff --git a/addons/base_calendar/i18n/mn.po b/addons/base_calendar/i18n/mn.po
index d632c61afcd..5475e67f0e2 100644
--- a/addons/base_calendar/i18n/mn.po
+++ b/addons/base_calendar/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-11-18 16:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-25 19:29+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-26 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -42,10 +42,9 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,vtimezone:0
-#: field:calendar.todo,vtimezone:0
-msgid "Timezone"
-msgstr "Цагийн бүс"
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event.edit.all,name:0
@@ -256,11 +255,10 @@ msgid "Days"
 msgstr "Өдрүүд"
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "No Repeat"
-msgstr "Давтахгүй"
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr "Урилгын мэдээлэл"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:0
@@ -432,11 +430,6 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
-#. module: base_calendar
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Confirm"
@@ -464,11 +457,6 @@ msgstr "Урилгын төрөл"
 msgid "Reminder details"
 msgstr ""
 
-#. module: base_calendar
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: base_calendar
 #: field:calendar.attendee,parent_ids:0
 msgid "Delegrated From"
@@ -506,11 +494,6 @@ msgstr "Имэйл"
 msgid "Event Detail"
 msgstr "Үйл явдлын мэдээлэл"
 
-#. module: base_calendar
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Run"
@@ -587,21 +570,11 @@ msgstr "Пү"
 msgid "Delegrated To"
 msgstr ""
 
-#. module: base_calendar
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr ""
-
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required Reply"
 msgstr ""
 
-#. module: base_calendar
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
@@ -691,6 +664,12 @@ msgstr "Эхний"
 msgid "Privacy"
 msgstr "Хувийн"
 
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr "Цагийн бүс"
+
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Subject"
@@ -807,10 +786,10 @@ msgid "Fri"
 msgstr "Ба"
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-#: view:calendar.event:0
-msgid "Invitation Detail"
-msgstr "Урилгын мэдээлэл"
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Count can not be Negative"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
@@ -839,22 +818,11 @@ msgstr "Ноорог"
 msgid "Attachment"
 msgstr "Хавсралт"
 
-#. module: base_calendar
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation From"
 msgstr ""
 
-#. module: base_calendar
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,alarm_id:0
@@ -989,6 +957,13 @@ msgstr "Да"
 msgid "Count"
 msgstr "Тоо"
 
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr "Давтахгүй"
+
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
@@ -1042,6 +1017,12 @@ msgstr "Завсар"
 msgid "Wednesday"
 msgstr "Лхагва"
 
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Interval can not be Negative"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.alarm,name:0
 #: view:calendar.event:0
@@ -1125,6 +1106,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: base_calendar
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.alarm,state:0
 #: view:calendar.attendee:0
@@ -1188,11 +1174,6 @@ msgstr ""
 msgid "Tuesday"
 msgstr "Мягмар"
 
-#. module: base_calendar
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Procedure"
diff --git a/addons/base_calendar/i18n/nl.po b/addons/base_calendar/i18n/nl.po
index 0fd2f5a0797..ba15d1f76a8 100644
--- a/addons/base_calendar/i18n/nl.po
+++ b/addons/base_calendar/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-11-18 16:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-27 04:09+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-11-28 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -44,10 +44,9 @@ msgstr ""
 "kalender-item"
 
 #. module: base_calendar
-#: field:calendar.event,vtimezone:0
-#: field:calendar.todo,vtimezone:0
-msgid "Timezone"
-msgstr "Tijdzone"
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event.edit.all,name:0
@@ -258,11 +257,10 @@ msgid "Days"
 msgstr "dagen"
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "No Repeat"
-msgstr "Niet terugkerend"
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr "Detail uitnodiging"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:0
@@ -434,11 +432,6 @@ msgstr "Wijzig alle gebeurtenissen"
 msgid "Attendees"
 msgstr "Deelnemers"
 
-#. module: base_calendar
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de actie-definiëring."
-
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Confirm"
@@ -466,11 +459,6 @@ msgstr "Type uitnodiging"
 msgid "Reminder details"
 msgstr "Details herinnering"
 
-#. module: base_calendar
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "De modulenaam moet uniek zijn !"
-
 #. module: base_calendar
 #: field:calendar.attendee,parent_ids:0
 msgid "Delegrated From"
@@ -508,11 +496,6 @@ msgstr "E-mail"
 msgid "Event Detail"
 msgstr "Detail gebeurtenis"
 
-#. module: base_calendar
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Run"
@@ -589,21 +572,11 @@ msgstr "don"
 msgid "Delegrated To"
 msgstr "Toegewezen aan"
 
-#. module: base_calendar
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr "Ongeldige argumenten"
-
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required Reply"
 msgstr "Antwoord vereist"
 
-#. module: base_calendar
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML, kan overzicht niet weergeven!"
-
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
@@ -693,6 +666,12 @@ msgstr "Eerste"
 msgid "Privacy"
 msgstr "Privacy"
 
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr "Tijdzone"
+
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Subject"
@@ -809,10 +788,10 @@ msgid "Fri"
 msgstr "Vrij"
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-#: view:calendar.event:0
-msgid "Invitation Detail"
-msgstr "Detail uitnodiging"
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Count can not be Negative"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
@@ -841,23 +820,11 @@ msgstr "Concept"
 msgid "Attachment"
 msgstr "Bijlage"
 
-#. module: base_calendar
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fout ! U kunt geen recursief Menu maken."
-
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation From"
 msgstr "Uitnodiging van"
 
-#. module: base_calendar
-#: 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: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,alarm_id:0
@@ -994,6 +961,13 @@ msgstr "Maa"
 msgid "Count"
 msgstr "Aantal"
 
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr "Niet terugkerend"
+
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
@@ -1047,6 +1021,12 @@ msgstr "Interval"
 msgid "Wednesday"
 msgstr "Woensdag"
 
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Interval can not be Negative"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.alarm,name:0
 #: view:calendar.event:0
@@ -1134,6 +1114,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr "Herhaling ID datum"
 
+#. module: base_calendar
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.alarm,state:0
 #: view:calendar.attendee:0
@@ -1197,11 +1182,6 @@ msgstr "res.users"
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-#. module: base_calendar
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Procedure"
@@ -1643,9 +1623,20 @@ msgstr "Vijfde"
 #~ "definieert een regel of herhalingspatroon voor een uitzondering op een "
 #~ "herhaling"
 
+#~ msgid "Invalid arguments"
+#~ msgstr "Ongeldige argumenten"
+
 #~ msgid "Select data for ExRule"
 #~ msgstr "Selecteer gegevens voor uitzondering regel"
 
+#~ 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 "Error ! You can not create recursive Menu."
+#~ msgstr "Fout ! U kunt geen recursief Menu maken."
+
 #~ msgid "ExRule"
 #~ msgstr "UitzRegel"
 
@@ -1663,3 +1654,18 @@ msgstr "Vijfde"
 #~ "bijlage bij een e-mail bericht,\n"
 #~ "                    * Verwijst naar een procedure bron, die wordt "
 #~ "aangeroepen nadat het alarm is afgegaan voor procedure."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ongeldige modelnaam in de actie-definiëring."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "De modulenaam moet uniek zijn !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
diff --git a/addons/base_calendar/i18n/pl.po b/addons/base_calendar/i18n/pl.po
index 152a1165752..ea659c175cc 100644
--- a/addons/base_calendar/i18n/pl.po
+++ b/addons/base_calendar/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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-08 08:29+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-11-09 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -42,10 +42,9 @@ msgid ""
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,vtimezone:0
-#: field:calendar.todo,vtimezone:0
-msgid "Timezone"
-msgstr "Strefa czasowa"
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event.edit.all,name:0
@@ -184,9 +183,9 @@ msgid "Indicats whether the favor of a reply is requested"
 msgstr ""
 
 #. module: base_calendar
-#: model:ir.model,name:base_calendar.model_ir_attachment
-msgid "ir.attachment"
-msgstr ""
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr "Alarm podstawowy"
 
 #. module: base_calendar
 #: help:calendar.attendee,delegated_to:0
@@ -218,6 +217,11 @@ msgstr "Pokaż czas jako"
 msgid "Tue"
 msgstr "Wto"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
@@ -225,12 +229,6 @@ msgstr "Wto"
 msgid "Yearly"
 msgstr "Co roku"
 
-#. module: base_calendar
-#: selection:calendar.alarm,trigger_related:0
-#: selection:res.alarm,trigger_related:0
-msgid "The event ends"
-msgstr "Koniec zdarzenia"
-
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
@@ -257,11 +255,10 @@ msgid "Days"
 msgstr "Dni"
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "No Repeat"
-msgstr "Bez powtarzania"
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr "Szczegóły zaproszenia"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:0
@@ -321,11 +318,10 @@ msgid "Secondly"
 msgstr "W drugiej kolejności"
 
 #. module: base_calendar
-#: field:calendar.alarm,event_date:0
-#: field:calendar.attendee,event_date:0
-#: view:calendar.event:0
-msgid "Event Date"
-msgstr "Data wydarzenia"
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr "Koniec zdarzenia"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -434,11 +430,6 @@ msgstr "Edytuj wszystkie zdarzenia"
 msgid "Attendees"
 msgstr "Uczestnicy"
 
-#. module: base_calendar
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Confirm"
@@ -579,21 +570,11 @@ msgstr "Czw"
 msgid "Delegrated To"
 msgstr "Przydzielono dla"
 
-#. module: base_calendar
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr "Nieprawidłowe parametry"
-
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required Reply"
 msgstr "Wymagana odpowiedź"
 
-#. module: base_calendar
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Niewłaściwy XML dla architektury widoku!"
-
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
@@ -683,6 +664,12 @@ msgstr "Pierwszy"
 msgid "Privacy"
 msgstr "Prywatność"
 
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr "Strefa czasowa"
+
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Subject"
@@ -799,10 +786,10 @@ msgid "Fri"
 msgstr "Pią"
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-#: view:calendar.event:0
-msgid "Invitation Detail"
-msgstr "Szczegóły zaproszenia"
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Count can not be Negative"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
@@ -831,24 +818,11 @@ msgstr "Projekt"
 msgid "Attachment"
 msgstr "Załącznik"
 
-#. module: base_calendar
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation From"
 msgstr "Zaproszenie od"
 
-#. module: base_calendar
-#: 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: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,alarm_id:0
@@ -921,9 +895,11 @@ msgid "June"
 msgstr "Czerwiec"
 
 #. module: base_calendar
-#: field:calendar.alarm,alarm_id:0
-msgid "Basic Alarm"
-msgstr "Alarm podstawowy"
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+msgstr "Data wydarzenia"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
@@ -981,6 +957,13 @@ msgstr "Pon"
 msgid "Count"
 msgstr "Liczba"
 
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr "Bez powtarzania"
+
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
@@ -1034,6 +1017,12 @@ msgstr "Interwał"
 msgid "Wednesday"
 msgstr "Środa"
 
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Interval can not be Negative"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.alarm,name:0
 #: view:calendar.event:0
@@ -1121,6 +1110,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr "Data ID powtarzalności"
 
+#. module: base_calendar
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.alarm,state:0
 #: view:calendar.attendee:0
@@ -1290,10 +1284,9 @@ msgid "Month"
 msgstr "Miesiąc"
 
 #. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-#: view:calendar.event:0
-msgid "Invite People"
-msgstr "Zaproś uczestników"
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,rrule:0
@@ -1353,6 +1346,12 @@ msgstr ""
 msgid "ir.values"
 msgstr ""
 
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr "Zaproś uczestników"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_model
 msgid "Objects"
@@ -1572,8 +1571,10 @@ msgid "Duration"
 msgstr "Czas trwania"
 
 #. module: base_calendar
-#: selection:base_calendar.invite.attendee,type:0
-msgid "External Email"
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid ""
+"Create specific calendar alarms that can be assigned to calendar events or "
+"meetings."
 msgstr ""
 
 #. module: base_calendar
@@ -1594,3 +1595,21 @@ msgstr "Sobota"
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
 msgstr "Piąty"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
+#~ msgid "Invalid arguments"
+#~ msgstr "Nieprawidłowe parametry"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Niewłaściwy XML dla architektury widoku!"
+
+#~ 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 "Error ! You can not create recursive Menu."
+#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
diff --git a/addons/base_calendar/i18n/pt.po b/addons/base_calendar/i18n/pt.po
index addcc062968..5c160412240 100644
--- a/addons/base_calendar/i18n/pt.po
+++ b/addons/base_calendar/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 18:00+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2010-12-14 23:02+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:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
diff --git a/addons/base_calendar/i18n/pt_BR.po b/addons/base_calendar/i18n/pt_BR.po
index c4b3efb0580..4b661a90a5e 100644
--- a/addons/base_calendar/i18n/pt_BR.po
+++ b/addons/base_calendar/i18n/pt_BR.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
diff --git a/addons/base_calendar/i18n/sk.po b/addons/base_calendar/i18n/sk.po
index 17e63f2faf1..cd32ba50e81 100644
--- a/addons/base_calendar/i18n/sk.po
+++ b/addons/base_calendar/i18n/sk.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-04 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
diff --git a/addons/base_calendar/i18n/sr.po b/addons/base_calendar/i18n/sr.po
index 89a7749e278..4c889978634 100644
--- a/addons/base_calendar/i18n/sr.po
+++ b/addons/base_calendar/i18n/sr.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 10:21+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-10-31 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -44,10 +44,9 @@ msgstr ""
 "komponentu kalendara"
 
 #. module: base_calendar
-#: field:calendar.event,vtimezone:0
-#: field:calendar.todo,vtimezone:0
-msgid "Timezone"
-msgstr "Vremenska zona"
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event.edit.all,name:0
@@ -186,9 +185,9 @@ msgid "Indicats whether the favor of a reply is requested"
 msgstr "Indikator da li se očekuje odgovor"
 
 #. module: base_calendar
-#: model:ir.model,name:base_calendar.model_ir_attachment
-msgid "ir.attachment"
-msgstr "ir.attachment"
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr "Osnovni alarmDelegirano od"
 
 #. module: base_calendar
 #: help:calendar.attendee,delegated_to:0
@@ -220,6 +219,11 @@ msgstr "Prikaži vreme kao"
 msgid "Tue"
 msgstr "Utorak"
 
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
@@ -227,12 +231,6 @@ msgstr "Utorak"
 msgid "Yearly"
 msgstr "Godišnje"
 
-#. module: base_calendar
-#: selection:calendar.alarm,trigger_related:0
-#: selection:res.alarm,trigger_related:0
-msgid "The event ends"
-msgstr "Događaj završava"
-
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
@@ -259,11 +257,10 @@ msgid "Days"
 msgstr "Dana"
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "No Repeat"
-msgstr "Bez ponavljanja"
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr "Detalji Poziva"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:0
@@ -323,11 +320,10 @@ msgid "Secondly"
 msgstr "Drugo"
 
 #. module: base_calendar
-#: field:calendar.alarm,event_date:0
-#: field:calendar.attendee,event_date:0
-#: view:calendar.event:0
-msgid "Event Date"
-msgstr "Datum događaja"
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr "Događaj završava"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -436,11 +432,6 @@ msgstr "Uredi sve događaje"
 msgid "Attendees"
 msgstr "Učesnici"
 
-#. module: base_calendar
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Pogrešno ime modela u definiciji akcije."
-
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Confirm"
@@ -581,21 +572,11 @@ msgstr "Čet"
 msgid "Delegrated To"
 msgstr "Proslijeđeno"
 
-#. module: base_calendar
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr "Neispravni Argumenti"
-
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required Reply"
 msgstr "Očekivan odgovor"
 
-#. module: base_calendar
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za pregled arhitekture"
-
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
@@ -685,6 +666,12 @@ msgstr "Prvi"
 msgid "Privacy"
 msgstr "Privatnost"
 
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr "Vremenska zona"
+
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Subject"
@@ -801,10 +788,10 @@ msgid "Fri"
 msgstr "Petak"
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-#: view:calendar.event:0
-msgid "Invitation Detail"
-msgstr "Detalji Poziva"
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Count can not be Negative"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
@@ -833,23 +820,11 @@ msgstr "Priprema"
 msgid "Attachment"
 msgstr "Dodatak"
 
-#. module: base_calendar
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation From"
 msgstr "Poziv Od"
 
-#. module: base_calendar
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,alarm_id:0
@@ -922,9 +897,11 @@ msgid "June"
 msgstr "Jun"
 
 #. module: base_calendar
-#: field:calendar.alarm,alarm_id:0
-msgid "Basic Alarm"
-msgstr "Osnovni alarmDelegirano od"
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+msgstr "Datum događaja"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
@@ -982,6 +959,13 @@ msgstr "Pon"
 msgid "Count"
 msgstr "Brojanje"
 
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr "Bez ponavljanja"
+
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
@@ -1035,6 +1019,12 @@ msgstr "Interval"
 msgid "Wednesday"
 msgstr "Sreda"
 
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Interval can not be Negative"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.alarm,name:0
 #: view:calendar.event:0
@@ -1122,6 +1112,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr "Ponavljajući ID datuma"
 
+#. module: base_calendar
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.alarm,state:0
 #: view:calendar.attendee:0
@@ -1296,10 +1291,9 @@ msgid "Month"
 msgstr "Mesec"
 
 #. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-#: view:calendar.event:0
-msgid "Invite People"
-msgstr "Pozovi Ljude"
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
+msgstr "Spoljni Email"
 
 #. module: base_calendar
 #: help:calendar.event,rrule:0
@@ -1362,6 +1356,12 @@ msgstr "Zaustavi"
 msgid "ir.values"
 msgstr "ir.values"
 
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr "Pozovi Ljude"
+
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_model
 msgid "Objects"
@@ -1588,9 +1588,11 @@ msgid "Duration"
 msgstr "Trajanje"
 
 #. module: base_calendar
-#: selection:base_calendar.invite.attendee,type:0
-msgid "External Email"
-msgstr "Spoljni Email"
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid ""
+"Create specific calendar alarms that can be assigned to calendar events or "
+"meetings."
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_date:0
@@ -1616,9 +1618,26 @@ msgstr "Peti"
 #~ msgstr ""
 #~ "Definise pravilo ili ponavljajući uzorak za eksepciju u skupu ponavljanja"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Pogrešno ime modela u definiciji akcije."
+
+#~ msgid "Invalid arguments"
+#~ msgstr "Neispravni Argumenti"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nevažeći XML za pregled arhitekture"
+
 #~ msgid "Select data for ExRule"
 #~ msgstr "Odaberi podatke za pravilo iznimke"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
+
 #~ msgid "ExRule"
 #~ msgstr "Pravilo Izuzetka"
 
diff --git a/addons/base_calendar/i18n/sr@latin.po b/addons/base_calendar/i18n/sr@latin.po
index f58ad38c292..cd175f50651 100644
--- a/addons/base_calendar/i18n/sr@latin.po
+++ b/addons/base_calendar/i18n/sr@latin.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-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
diff --git a/addons/base_calendar/i18n/sv.po b/addons/base_calendar/i18n/sv.po
index 9c26a2e4e07..e4c7cf8f6ae 100644
--- a/addons/base_calendar/i18n/sv.po
+++ b/addons/base_calendar/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-12 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
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 2f6d90afe19..b907df0fd57 100644
--- a/addons/base_contact/i18n/pt.po
+++ b/addons/base_contact/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-01 09:29+0000\n"
+"PO-Revision-Date: 2010-12-15 03:40+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:04+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/ar.po b/addons/base_iban/i18n/ar.po
index 84c17afe0a0..33941e85757 100644
--- a/addons/base_iban/i18n/ar.po
+++ b/addons/base_iban/i18n/ar.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
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/bg.po b/addons/base_iban/i18n/bg.po
index 11557b0dd3e..b63bb2e5fac 100644
--- a/addons/base_iban/i18n/bg.po
+++ b/addons/base_iban/i18n/bg.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/bs.po b/addons/base_iban/i18n/bs.po
index aa2f4b05c8c..249beb4126d 100644
--- a/addons/base_iban/i18n/bs.po
+++ b/addons/base_iban/i18n/bs.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/ca.po b/addons/base_iban/i18n/ca.po
index eacb957652e..78871080b3f 100644
--- a/addons/base_iban/i18n/ca.po
+++ b/addons/base_iban/i18n/ca.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/cs.po b/addons/base_iban/i18n/cs.po
index 270d5bf4e72..f40adbe9973 100644
--- a/addons/base_iban/i18n/cs.po
+++ b/addons/base_iban/i18n/cs.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/de.po b/addons/base_iban/i18n/de.po
index b36d72cbccf..d8f24201071 100644
--- a/addons/base_iban/i18n/de.po
+++ b/addons/base_iban/i18n/de.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/el.po b/addons/base_iban/i18n/el.po
index 8ce94f37ad9..dc92ec85d22 100644
--- a/addons/base_iban/i18n/el.po
+++ b/addons/base_iban/i18n/el.po
@@ -9,7 +9,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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/base_iban/i18n/es.po b/addons/base_iban/i18n/es.po
index 37ba8139d58..009bdc2e7e3 100644
--- a/addons/base_iban/i18n/es.po
+++ b/addons/base_iban/i18n/es.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/es_AR.po b/addons/base_iban/i18n/es_AR.po
index 01989708190..7ede8977d4b 100644
--- a/addons/base_iban/i18n/es_AR.po
+++ b/addons/base_iban/i18n/es_AR.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/es_EC.po b/addons/base_iban/i18n/es_EC.po
index c5e99034efd..1e791ae4a79 100644
--- a/addons/base_iban/i18n/es_EC.po
+++ b/addons/base_iban/i18n/es_EC.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/et.po b/addons/base_iban/i18n/et.po
index df653302b1c..251c413fa6b 100644
--- a/addons/base_iban/i18n/et.po
+++ b/addons/base_iban/i18n/et.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/eu.po b/addons/base_iban/i18n/eu.po
index dcf788325bf..4df8d196bc0 100644
--- a/addons/base_iban/i18n/eu.po
+++ b/addons/base_iban/i18n/eu.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/fi.po b/addons/base_iban/i18n/fi.po
index abb2048a2c3..d8c2c5ffbd7 100644
--- a/addons/base_iban/i18n/fi.po
+++ b/addons/base_iban/i18n/fi.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/fr.po b/addons/base_iban/i18n/fr.po
index 0e84cf1186d..d01dd231285 100644
--- a/addons/base_iban/i18n/fr.po
+++ b/addons/base_iban/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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/gl.po b/addons/base_iban/i18n/gl.po
index 4db0706f1c7..b71b14c85a9 100644
--- a/addons/base_iban/i18n/gl.po
+++ b/addons/base_iban/i18n/gl.po
@@ -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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/hr.po b/addons/base_iban/i18n/hr.po
index f01c6cf516d..f21e715aab4 100644
--- a/addons/base_iban/i18n/hr.po
+++ b/addons/base_iban/i18n/hr.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/base_iban/i18n/hu.po b/addons/base_iban/i18n/hu.po
index 84c17afe0a0..e492c586dc2 100644
--- a/addons/base_iban/i18n/hu.po
+++ b/addons/base_iban/i18n/hu.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/id.po b/addons/base_iban/i18n/id.po
index aba1438be3a..a4452056431 100644
--- a/addons/base_iban/i18n/id.po
+++ b/addons/base_iban/i18n/id.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/it.po b/addons/base_iban/i18n/it.po
index 4e707b3cb4a..23a76b0e591 100644
--- a/addons/base_iban/i18n/it.po
+++ b/addons/base_iban/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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/ko.po b/addons/base_iban/i18n/ko.po
index 4ac55a35acf..6f556b82abf 100644
--- a/addons/base_iban/i18n/ko.po
+++ b/addons/base_iban/i18n/ko.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/lt.po b/addons/base_iban/i18n/lt.po
index f4a442ea642..55a74384316 100644
--- a/addons/base_iban/i18n/lt.po
+++ b/addons/base_iban/i18n/lt.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/lv.po b/addons/base_iban/i18n/lv.po
index 5fe1a5da37a..e65fd877276 100644
--- a/addons/base_iban/i18n/lv.po
+++ b/addons/base_iban/i18n/lv.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/nl.po b/addons/base_iban/i18n/nl.po
index 500b12723a5..d53e59cb4d5 100644
--- a/addons/base_iban/i18n/nl.po
+++ b/addons/base_iban/i18n/nl.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/nl_BE.po b/addons/base_iban/i18n/nl_BE.po
index 14a341352f2..7575f3e4c59 100644
--- a/addons/base_iban/i18n/nl_BE.po
+++ b/addons/base_iban/i18n/nl_BE.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/oc.po b/addons/base_iban/i18n/oc.po
index 6ad3050801a..36f5ca8d2af 100644
--- a/addons/base_iban/i18n/oc.po
+++ b/addons/base_iban/i18n/oc.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/pl.po b/addons/base_iban/i18n/pl.po
index 02bb9ded9b0..5d0f680ee27 100644
--- a/addons/base_iban/i18n/pl.po
+++ b/addons/base_iban/i18n/pl.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/pt.po b/addons/base_iban/i18n/pt.po
index 6d5c017426d..44ff1a22c66 100644
--- a/addons/base_iban/i18n/pt.po
+++ b/addons/base_iban/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-10 17:15+0000\n"
-"PO-Revision-Date: 2010-12-12 18:02+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 01:41+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:01+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/pt_BR.po b/addons/base_iban/i18n/pt_BR.po
index 873c3906125..f01c9b77c32 100644
--- a/addons/base_iban/i18n/pt_BR.po
+++ b/addons/base_iban/i18n/pt_BR.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/ro.po b/addons/base_iban/i18n/ro.po
index 5ca2d390bbf..924c2dbc919 100644
--- a/addons/base_iban/i18n/ro.po
+++ b/addons/base_iban/i18n/ro.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/ru.po b/addons/base_iban/i18n/ru.po
index fc3e3c2bec2..47ec746bc43 100644
--- a/addons/base_iban/i18n/ru.po
+++ b/addons/base_iban/i18n/ru.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/sk.po b/addons/base_iban/i18n/sk.po
index 3e144eaf4e3..376109a7bb4 100644
--- a/addons/base_iban/i18n/sk.po
+++ b/addons/base_iban/i18n/sk.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 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 8fad081c948..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-14 05:01+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_iban/i18n/sq.po b/addons/base_iban/i18n/sq.po
index f8124fdd4f8..5a325a40ca1 100644
--- a/addons/base_iban/i18n/sq.po
+++ b/addons/base_iban/i18n/sq.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/sr.po b/addons/base_iban/i18n/sr.po
index 0d9442b4fd2..fa29de29d9a 100644
--- a/addons/base_iban/i18n/sr.po
+++ b/addons/base_iban/i18n/sr.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/sr@latin.po b/addons/base_iban/i18n/sr@latin.po
index 5d49ac91c24..3d9d4bb2bf2 100644
--- a/addons/base_iban/i18n/sr@latin.po
+++ b/addons/base_iban/i18n/sr@latin.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/sv.po b/addons/base_iban/i18n/sv.po
index 81c969d47de..9e3e78555fd 100644
--- a/addons/base_iban/i18n/sv.po
+++ b/addons/base_iban/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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/tlh.po b/addons/base_iban/i18n/tlh.po
index 208b8cfdfe0..9969067bebe 100644
--- a/addons/base_iban/i18n/tlh.po
+++ b/addons/base_iban/i18n/tlh.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/tr.po b/addons/base_iban/i18n/tr.po
index 88eeea35cdd..ddc5571e5e9 100644
--- a/addons/base_iban/i18n/tr.po
+++ b/addons/base_iban/i18n/tr.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/uk.po b/addons/base_iban/i18n/uk.po
index b64ad9a65aa..7c0cdbd153f 100644
--- a/addons/base_iban/i18n/uk.po
+++ b/addons/base_iban/i18n/uk.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/vi.po b/addons/base_iban/i18n/vi.po
index fe83715ff09..653414a1086 100644
--- a/addons/base_iban/i18n/vi.po
+++ b/addons/base_iban/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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/zh_CN.po b/addons/base_iban/i18n/zh_CN.po
index fb8773c2575..b384a5a4404 100644
--- a/addons/base_iban/i18n/zh_CN.po
+++ b/addons/base_iban/i18n/zh_CN.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/zh_TW.po b/addons/base_iban/i18n/zh_TW.po
index 949640f4e20..6e7f5b7687c 100644
--- a/addons/base_iban/i18n/zh_TW.po
+++ b/addons/base_iban/i18n/zh_TW.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
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/ab.po b/addons/base_module_quality/i18n/ab.po
index d8bcf7c95c1..17db4fecce0 100644
--- a/addons/base_module_quality/i18n/ab.po
+++ b/addons/base_module_quality/i18n/ab.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/ar.po b/addons/base_module_quality/i18n/ar.po
index 045038c65e0..cfe21cf6d8f 100644
--- a/addons/base_module_quality/i18n/ar.po
+++ b/addons/base_module_quality/i18n/ar.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
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/bg.po b/addons/base_module_quality/i18n/bg.po
index f456678832b..c707ffd4e83 100644
--- a/addons/base_module_quality/i18n/bg.po
+++ b/addons/base_module_quality/i18n/bg.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/bs.po b/addons/base_module_quality/i18n/bs.po
index 4902271ecb5..eb5466068a8 100644
--- a/addons/base_module_quality/i18n/bs.po
+++ b/addons/base_module_quality/i18n/bs.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/ca.po b/addons/base_module_quality/i18n/ca.po
index e180b5be668..5e856c03fee 100644
--- a/addons/base_module_quality/i18n/ca.po
+++ b/addons/base_module_quality/i18n/ca.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/cs.po b/addons/base_module_quality/i18n/cs.po
index cf2d7f4d4fc..b707a8e24be 100644
--- a/addons/base_module_quality/i18n/cs.po
+++ b/addons/base_module_quality/i18n/cs.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/de.po b/addons/base_module_quality/i18n/de.po
index 5b3c693a23a..f98724a08bf 100644
--- a/addons/base_module_quality/i18n/de.po
+++ b/addons/base_module_quality/i18n/de.po
@@ -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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/el.po b/addons/base_module_quality/i18n/el.po
index 32d6072ffaf..50f0a6b5e22 100644
--- a/addons/base_module_quality/i18n/el.po
+++ b/addons/base_module_quality/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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/es.po b/addons/base_module_quality/i18n/es.po
index 57ebaba8ccb..fc0eb896acf 100644
--- a/addons/base_module_quality/i18n/es.po
+++ b/addons/base_module_quality/i18n/es.po
@@ -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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/es_AR.po b/addons/base_module_quality/i18n/es_AR.po
index 2b0413fa0df..b6448b7eba9 100644
--- a/addons/base_module_quality/i18n/es_AR.po
+++ b/addons/base_module_quality/i18n/es_AR.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/es_EC.po b/addons/base_module_quality/i18n/es_EC.po
index ec2a426fbc9..24811c90c5f 100644
--- a/addons/base_module_quality/i18n/es_EC.po
+++ b/addons/base_module_quality/i18n/es_EC.po
@@ -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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/et.po b/addons/base_module_quality/i18n/et.po
index d03ce600d23..919030d5443 100644
--- a/addons/base_module_quality/i18n/et.po
+++ b/addons/base_module_quality/i18n/et.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/fi.po b/addons/base_module_quality/i18n/fi.po
index 4e94563b6eb..3af973191a8 100644
--- a/addons/base_module_quality/i18n/fi.po
+++ b/addons/base_module_quality/i18n/fi.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/fr.po b/addons/base_module_quality/i18n/fr.po
index efd79e5ce68..151e058a854 100644
--- a/addons/base_module_quality/i18n/fr.po
+++ b/addons/base_module_quality/i18n/fr.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/gl.po b/addons/base_module_quality/i18n/gl.po
index 61d7d40bf81..1c8b725b56f 100644
--- a/addons/base_module_quality/i18n/gl.po
+++ b/addons/base_module_quality/i18n/gl.po
@@ -16,7 +16,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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/hr.po b/addons/base_module_quality/i18n/hr.po
index e0563ade472..7e3dd74f6c4 100644
--- a/addons/base_module_quality/i18n/hr.po
+++ b/addons/base_module_quality/i18n/hr.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/base_module_quality/i18n/hu.po b/addons/base_module_quality/i18n/hu.po
index 62d07874cce..b7e04357ada 100644
--- a/addons/base_module_quality/i18n/hu.po
+++ b/addons/base_module_quality/i18n/hu.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/id.po b/addons/base_module_quality/i18n/id.po
index 050c52a1439..530eda2f0c7 100644
--- a/addons/base_module_quality/i18n/id.po
+++ b/addons/base_module_quality/i18n/id.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/it.po b/addons/base_module_quality/i18n/it.po
index 6eef3501499..d7f0bb5f064 100644
--- a/addons/base_module_quality/i18n/it.po
+++ b/addons/base_module_quality/i18n/it.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/iu.po b/addons/base_module_quality/i18n/iu.po
index ee6b3f7deab..c92d32b4c43 100644
--- a/addons/base_module_quality/i18n/iu.po
+++ b/addons/base_module_quality/i18n/iu.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/ko.po b/addons/base_module_quality/i18n/ko.po
index d2dff0a757b..712693801c1 100644
--- a/addons/base_module_quality/i18n/ko.po
+++ b/addons/base_module_quality/i18n/ko.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/lt.po b/addons/base_module_quality/i18n/lt.po
index caf217c2890..06c61fdcb7e 100644
--- a/addons/base_module_quality/i18n/lt.po
+++ b/addons/base_module_quality/i18n/lt.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/mn.po b/addons/base_module_quality/i18n/mn.po
index 1865629b7e5..d7784112a60 100644
--- a/addons/base_module_quality/i18n/mn.po
+++ b/addons/base_module_quality/i18n/mn.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/nl.po b/addons/base_module_quality/i18n/nl.po
index 8272557aafd..ca1ae85e12e 100644
--- a/addons/base_module_quality/i18n/nl.po
+++ b/addons/base_module_quality/i18n/nl.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/pl.po b/addons/base_module_quality/i18n/pl.po
index cfbc076aaf2..c74564317ba 100644
--- a/addons/base_module_quality/i18n/pl.po
+++ b/addons/base_module_quality/i18n/pl.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/pt.po b/addons/base_module_quality/i18n/pt.po
index b14aef8da1d..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-14 05:32+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/pt_BR.po b/addons/base_module_quality/i18n/pt_BR.po
index 7aee8f031a0..725631ca389 100644
--- a/addons/base_module_quality/i18n/pt_BR.po
+++ b/addons/base_module_quality/i18n/pt_BR.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/ro.po b/addons/base_module_quality/i18n/ro.po
index 9dccf998dbf..bdff47e9022 100644
--- a/addons/base_module_quality/i18n/ro.po
+++ b/addons/base_module_quality/i18n/ro.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/ru.po b/addons/base_module_quality/i18n/ru.po
index f71ca4302d4..c1d605812fa 100644
--- a/addons/base_module_quality/i18n/ru.po
+++ b/addons/base_module_quality/i18n/ru.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/sk.po b/addons/base_module_quality/i18n/sk.po
index 3b31276c20c..abde68070fd 100644
--- a/addons/base_module_quality/i18n/sk.po
+++ b/addons/base_module_quality/i18n/sk.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/sl.po b/addons/base_module_quality/i18n/sl.po
index 0abceee70b4..31e70d5e356 100644
--- a/addons/base_module_quality/i18n/sl.po
+++ b/addons/base_module_quality/i18n/sl.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/sq.po b/addons/base_module_quality/i18n/sq.po
index ca7e2494b1b..0802dad41d6 100644
--- a/addons/base_module_quality/i18n/sq.po
+++ b/addons/base_module_quality/i18n/sq.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/sr.po b/addons/base_module_quality/i18n/sr.po
index 9886785aa58..741ed240418 100644
--- a/addons/base_module_quality/i18n/sr.po
+++ b/addons/base_module_quality/i18n/sr.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/sr@latin.po b/addons/base_module_quality/i18n/sr@latin.po
index 181f76adca7..cdd5df24abd 100644
--- a/addons/base_module_quality/i18n/sr@latin.po
+++ b/addons/base_module_quality/i18n/sr@latin.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+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 5d3779737ed..4983a90a64a 100644
--- a/addons/base_module_quality/i18n/sv.po
+++ b/addons/base_module_quality/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-13 20:53+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 05:04+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:32+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/tr.po b/addons/base_module_quality/i18n/tr.po
index 58f3a12f1bd..5b2f591664a 100644
--- a/addons/base_module_quality/i18n/tr.po
+++ b/addons/base_module_quality/i18n/tr.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/uk.po b/addons/base_module_quality/i18n/uk.po
index e95c6634d12..05285ec729b 100644
--- a/addons/base_module_quality/i18n/uk.po
+++ b/addons/base_module_quality/i18n/uk.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/vi.po b/addons/base_module_quality/i18n/vi.po
index d866fac24c8..a23b29fdcdc 100644
--- a/addons/base_module_quality/i18n/vi.po
+++ b/addons/base_module_quality/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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/zh_CN.po b/addons/base_module_quality/i18n/zh_CN.po
index b8c4a434616..6f38f2532d0 100644
--- a/addons/base_module_quality/i18n/zh_CN.po
+++ b/addons/base_module_quality/i18n/zh_CN.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/zh_TW.po b/addons/base_module_quality/i18n/zh_TW.po
index 62d07874cce..b7e04357ada 100644
--- a/addons/base_module_quality/i18n/zh_TW.po
+++ b/addons/base_module_quality/i18n/zh_TW.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+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/ar.po b/addons/base_report_creator/i18n/ar.po
index 5a8c033a3fb..225572e6ad2 100644
--- a/addons/base_report_creator/i18n/ar.po
+++ b/addons/base_report_creator/i18n/ar.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -126,11 +126,6 @@ msgstr ""
 msgid "No Related Models!!"
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -141,6 +136,11 @@ msgstr ""
 msgid "Sum"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -194,8 +194,8 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
 msgstr ""
 
 #. module: base_report_creator
@@ -236,6 +236,11 @@ msgstr ""
 msgid "AND"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -321,13 +326,6 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -377,9 +375,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
 
 #. module: base_report_creator
@@ -408,8 +405,10 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
 msgstr ""
 
 #. module: base_report_creator
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/bg.po b/addons/base_report_creator/i18n/bg.po
index 4d5b6e6f930..f3967918486 100644
--- a/addons/base_report_creator/i18n/bg.po
+++ b/addons/base_report_creator/i18n/bg.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2008-09-29 00:56+0000\n"
 "Last-Translator: Tsvetin Vasilev <cecipv@yahoo.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-10-30 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -126,11 +126,6 @@ msgstr ""
 msgid "No Related Models!!"
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -141,6 +136,11 @@ msgstr ""
 msgid "Sum"
 msgstr "Сума"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -194,9 +194,9 @@ msgid "Starting Date"
 msgstr "Начална дата"
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr ""
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -236,6 +236,11 @@ msgstr ""
 msgid "AND"
 msgstr "И"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -321,13 +326,6 @@ msgstr "Метод на групиране"
 msgid "Condition"
 msgstr ""
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -377,12 +375,9 @@ msgid "Cancel"
 msgstr "Откажи"
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
-"Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-"символи!"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -410,8 +405,10 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
 msgstr ""
 
 #. module: base_report_creator
@@ -520,12 +517,21 @@ msgstr ""
 #~ msgid "Valid"
 #~ msgstr "Валиден"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Невалиден XML за преглед на архитектурата"
+
 #~ msgid "Draft"
 #~ msgstr "Чернова"
 
 #~ msgid "Status"
 #~ msgstr "Състояние"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
+#~ "символи!"
+
 #~ msgid "Uniq Colors"
 #~ msgstr "Уникални цветове"
 
diff --git a/addons/base_report_creator/i18n/bs.po b/addons/base_report_creator/i18n/bs.po
index da684b5aada..f5958ad3dfd 100644
--- a/addons/base_report_creator/i18n/bs.po
+++ b/addons/base_report_creator/i18n/bs.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 12:08+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-10-30 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -126,11 +126,6 @@ msgstr ""
 msgid "No Related Models!!"
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -141,6 +136,11 @@ msgstr ""
 msgid "Sum"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -194,9 +194,9 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr ""
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -236,6 +236,11 @@ msgstr ""
 msgid "AND"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -321,13 +326,6 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -377,9 +375,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
 
 #. module: base_report_creator
@@ -408,8 +405,10 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
 msgstr ""
 
 #. module: base_report_creator
@@ -514,3 +513,6 @@ msgid ""
 "After installing the module, it adds a menu to define custom report in\n"
 "the \"Dashboard\" menu.\n"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
diff --git a/addons/base_report_creator/i18n/ca.po b/addons/base_report_creator/i18n/ca.po
index d1ab39c2db2..aaa0df1ea27 100644
--- a/addons/base_report_creator/i18n/ca.po
+++ b/addons/base_report_creator/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 14:07+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -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-10-31 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -132,11 +132,6 @@ msgstr "Informes personalitzats"
 msgid "No Related Models!!"
 msgstr "No existeixen models relacionats!"
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de model no vàlid en la definició de l'acció."
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -147,6 +142,11 @@ msgstr "Informació del menú"
 msgid "Sum"
 msgstr "Suma"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -200,9 +200,9 @@ msgid "Starting Date"
 msgstr "Data d'inici"
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr "Filtres en camps"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -242,6 +242,11 @@ msgstr "Nom menú"
 msgid "AND"
 msgstr "I"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -327,13 +332,6 @@ msgstr "Mètode agrupació"
 msgid "Condition"
 msgstr "Condició"
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -383,12 +381,9 @@ msgid "Cancel"
 msgstr "Cancel·la"
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
-"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-"especial!"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -416,9 +411,11 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
-msgstr "Filtres en camps"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
@@ -529,12 +526,21 @@ msgstr ""
 #~ msgid "Valid"
 #~ msgstr "Vàlid"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invàlid per a la definició de la vista!"
+
 #~ msgid "Draft"
 #~ msgstr "Esborrany"
 
 #~ msgid "Status"
 #~ msgstr "Posició"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+#~ "especial!"
+
 #~ msgid "Uniq Colors"
 #~ msgstr "Colors únics"
 
@@ -555,3 +561,6 @@ msgstr ""
 #~ "\n"
 #~ "Després d'instal·lar el mòdul s'afegeix un menú per definir informes\n"
 #~ "personalitzats dins del menú \"Taulers\".\n"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom de model no vàlid en la definició de l'acció."
diff --git a/addons/base_report_creator/i18n/cs.po b/addons/base_report_creator/i18n/cs.po
index 5a8c033a3fb..225572e6ad2 100644
--- a/addons/base_report_creator/i18n/cs.po
+++ b/addons/base_report_creator/i18n/cs.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -126,11 +126,6 @@ msgstr ""
 msgid "No Related Models!!"
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -141,6 +136,11 @@ msgstr ""
 msgid "Sum"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -194,8 +194,8 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
 msgstr ""
 
 #. module: base_report_creator
@@ -236,6 +236,11 @@ msgstr ""
 msgid "AND"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -321,13 +326,6 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -377,9 +375,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
 
 #. module: base_report_creator
@@ -408,8 +405,10 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
 msgstr ""
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/de.po b/addons/base_report_creator/i18n/de.po
index 4ecd24f9fb1..8ff342ae5c7 100644
--- a/addons/base_report_creator/i18n/de.po
+++ b/addons/base_report_creator/i18n/de.po
@@ -6,7 +6,7 @@ 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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-30 15:52+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -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-01 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -131,11 +131,6 @@ msgstr "Individuelle Reports"
 msgid "No Related Models!!"
 msgstr "Nicht verbundene Module"
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -146,6 +141,11 @@ msgstr "Menu Information"
 msgid "Sum"
 msgstr "Summe"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -161,11 +161,6 @@ msgstr "Felder in Reports"
 msgid "Report Type"
 msgstr "Report Type"
 
-#. module: base_report_creator
-#: 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 !"
-
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Add filter"
@@ -204,9 +199,9 @@ msgid "Starting Date"
 msgstr "Start Datum:"
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr "Filter auf Datenfelder"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -247,9 +242,9 @@ msgid "AND"
 msgstr "UND"
 
 #. module: base_report_creator
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
@@ -336,15 +331,6 @@ msgstr "Methode Gruppierung"
 msgid "Condition"
 msgstr "Bedingung"
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-"Durch De-Aktivierung können Sie diese Auswertung verbergen, ohne den Report "
-"zu löschen."
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -394,17 +380,9 @@ msgid "Cancel"
 msgstr "Abbrechen"
 
 #. module: base_report_creator
-#: 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 !"
-
-#. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -432,9 +410,11 @@ msgid "Unique Colors"
 msgstr "Uni Farben"
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
-msgstr "Filter auf Datenfelder"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
@@ -551,12 +531,21 @@ msgstr ""
 #~ msgid "Valid"
 #~ msgstr "Gültig"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "Draft"
 #~ msgstr "Entwurf"
 
 #~ msgid "Status"
 #~ msgstr "Status"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "Uniq Colors"
 #~ msgstr "Uni Farben"
 
@@ -576,3 +565,22 @@ msgstr ""
 #~ "Es erstellt SQL - Anfragen für Endbenutzer.\n"
 #~ "\n"
 #~ "Bei der Installation entsteht ein Menüeintrag im Anzeigetafeln-Menü\n"
+
+#~ 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 report "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Durch De-Aktivierung können Sie diese Auswertung verbergen, ohne den Report "
+#~ "zu löschen."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/base_report_creator/i18n/el.po b/addons/base_report_creator/i18n/el.po
index 67f82ddb3d5..cbe0eef34fc 100644
--- a/addons/base_report_creator/i18n/el.po
+++ b/addons/base_report_creator/i18n/el.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 02:31+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -132,11 +132,6 @@ msgstr "Ειδικές Αναφορές"
 msgid "No Related Models!!"
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -147,6 +142,11 @@ msgstr "Πληροφορίες Μενού"
 msgid "Sum"
 msgstr "'Αθροισμα"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -200,9 +200,9 @@ msgid "Starting Date"
 msgstr "Ημερ/νία Εκκίνησης"
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr "Φίλτρα σε Πεδία"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -242,6 +242,11 @@ msgstr "Όνομα Μενού"
 msgid "AND"
 msgstr "KAI"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -327,13 +332,6 @@ msgstr "Μέθοδος Ομαδοποίησης"
 msgid "Condition"
 msgstr "Συνθήκη"
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -383,11 +381,9 @@ msgid "Cancel"
 msgstr "Ακύρωση"
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
-"Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες!"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -415,9 +411,11 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
-msgstr "Φίλτρα σε Πεδία"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
@@ -522,6 +520,14 @@ msgid ""
 "the \"Dashboard\" menu.\n"
 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 "State"
 #~ msgstr "Κατάσταση"
 
@@ -554,3 +560,6 @@ msgstr ""
 #~ "\n"
 #~ "After installing the module, it adds a menu to define custom report in\n"
 #~ "the \"Dashboard\" menu.\n"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
diff --git a/addons/base_report_creator/i18n/es.po b/addons/base_report_creator/i18n/es.po
index a9c73f871d2..b5762d67c8e 100644
--- a/addons/base_report_creator/i18n/es.po
+++ b/addons/base_report_creator/i18n/es.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-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/es_AR.po b/addons/base_report_creator/i18n/es_AR.po
index 497f45f26e5..5aae0b9b921 100644
--- a/addons/base_report_creator/i18n/es_AR.po
+++ b/addons/base_report_creator/i18n/es_AR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-15 19:29+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.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-10-30 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -128,11 +128,6 @@ msgstr "Reportes personalizados"
 msgid "No Related Models!!"
 msgstr "¡No existen modelos relacionados!"
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -143,6 +138,11 @@ msgstr "Información del menú"
 msgid "Sum"
 msgstr "Suma"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -196,9 +196,9 @@ msgid "Starting Date"
 msgstr "Fecha de inicio"
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr "Filtros en campos"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -238,6 +238,11 @@ msgstr "Nombre del menú"
 msgid "AND"
 msgstr "Y"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -323,13 +328,6 @@ msgstr "Método de agrupación"
 msgid "Condition"
 msgstr "Condición"
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -379,12 +377,9 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
-"especial!"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -412,9 +407,11 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
-msgstr "Filtros en campos"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
diff --git a/addons/base_report_creator/i18n/et.po b/addons/base_report_creator/i18n/et.po
index 2e25687c172..490e0d3fc81 100644
--- a/addons/base_report_creator/i18n/et.po
+++ b/addons/base_report_creator/i18n/et.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-09 16:46+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-10-30 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -126,11 +126,6 @@ msgstr "Kohandatud aruanded"
 msgid "No Related Models!!"
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -141,6 +136,11 @@ msgstr "Menüü info"
 msgid "Sum"
 msgstr "Kokku"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -194,9 +194,9 @@ msgid "Starting Date"
 msgstr "Alguskuupäev"
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr "Filtrid väljadel"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -236,6 +236,11 @@ msgstr "Menüü nimi"
 msgid "AND"
 msgstr "AND"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -321,13 +326,6 @@ msgstr "Grupeerimise meetod"
 msgid "Condition"
 msgstr "Tingimus"
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -377,11 +375,9 @@ msgid "Cancel"
 msgstr "Loobu"
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
-"Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -409,9 +405,11 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
-msgstr "Filtrid väljadel"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
@@ -522,15 +520,26 @@ msgstr ""
 #~ msgid "Valid"
 #~ msgstr "Kehtiv"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Vigane XML vaate arhitektuurile!"
+
 #~ msgid "Draft"
 #~ msgstr "Mustand"
 
+#~ 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 "Uniq Colors"
 #~ msgstr "Unikaalsed värvid"
 
 #~ msgid "Reports"
 #~ msgstr "Aruanded"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
+
 #~ msgid ""
 #~ "This modules allows you to create any statistic\n"
 #~ "report on several object. It's a SQL query builder and browser\n"
diff --git a/addons/base_report_creator/i18n/fi.po b/addons/base_report_creator/i18n/fi.po
index 637afa11023..674806982ac 100644
--- a/addons/base_report_creator/i18n/fi.po
+++ b/addons/base_report_creator/i18n/fi.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 02:32+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: Finnish <fi@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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -129,11 +129,6 @@ msgstr "Tilausraportit"
 msgid "No Related Models!!"
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -144,6 +139,11 @@ msgstr "Valikon tiedot"
 msgid "Sum"
 msgstr "Summa"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -197,9 +197,9 @@ msgid "Starting Date"
 msgstr "Aloituspäivämäärä"
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Virheellinen XML näkymäarkkitehtuurille!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr "Kenttien suodattimet"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -239,6 +239,11 @@ msgstr "Valikon nimi"
 msgid "AND"
 msgstr "JA"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -324,13 +329,6 @@ msgstr "Ryhmittelytapa"
 msgid "Condition"
 msgstr "Ehto"
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -380,10 +378,9 @@ msgid "Cancel"
 msgstr "Peruuta"
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
+msgstr ""
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -411,9 +408,11 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
-msgstr "Kenttien suodattimet"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
@@ -530,6 +529,12 @@ msgstr ""
 #~ msgid "Reports"
 #~ msgstr "Raportit"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Virheellinen XML näkymäarkkitehtuurille!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
+
 #~ msgid "State"
 #~ msgstr "Tila"
 
@@ -552,3 +557,7 @@ msgstr ""
 #~ "Moduulin asentamisen jälkeen se lisää valikon joka määrittelee omaehtoisen "
 #~ "raportin\n"
 #~ "\"Dashboard (mittaristo) -valikossa.\n"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
diff --git a/addons/base_report_creator/i18n/fr.po b/addons/base_report_creator/i18n/fr.po
index 6984ae09acd..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-11 05:04+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/i18n/hr.po b/addons/base_report_creator/i18n/hr.po
index 030418fd1de..4b70e8b2932 100644
--- a/addons/base_report_creator/i18n/hr.po
+++ b/addons/base_report_creator/i18n/hr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 12:22+0000\n"
 "Last-Translator: goranc <goranc@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-10-31 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -130,11 +130,6 @@ msgstr "Prilagođeni izvještaji"
 msgid "No Related Models!!"
 msgstr "Nema srodnih modela!!"
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Pogrešno ime modela u definiciji akcije."
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -145,6 +140,11 @@ msgstr "Informacije o izborniku"
 msgid "Sum"
 msgstr "Suma"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -198,9 +198,9 @@ msgid "Starting Date"
 msgstr "Početni datum"
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neispravan XML za arhitekturu prikaza!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr "Filtri na poljima"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -240,6 +240,11 @@ msgstr "Naziv izbornika"
 msgid "AND"
 msgstr "AND"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -325,13 +330,6 @@ msgstr "Način grupiranja"
 msgid "Condition"
 msgstr "Uvjet"
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -381,11 +379,9 @@ msgid "Cancel"
 msgstr "Poništi"
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
-"Naziv objekta mora početi sa x_ i ne smije sadržavati specijalne znakove !"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -413,9 +409,11 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
-msgstr "Filtri na poljima"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
@@ -520,6 +518,9 @@ msgid ""
 "the \"Dashboard\" menu.\n"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neispravan XML za arhitekturu prikaza!"
+
 #~ msgid "Reports"
 #~ msgstr "Izvještaji"
 
@@ -538,6 +539,11 @@ msgstr ""
 #~ msgid "Draft"
 #~ msgstr "Skica"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta mora početi sa x_ i ne smije sadržavati specijalne znakove !"
+
 #~ msgid ""
 #~ "This modules allows you to create any statistic\n"
 #~ "report on several object. It's a SQL query builder and browser\n"
@@ -553,3 +559,6 @@ msgstr ""
 #~ "Nakon instalacije, modul dodaje izbornik za kreiranje prilagođenog "
 #~ "izvještaja\n"
 #~ "na izborniku nadzorne ploče.\n"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Pogrešno ime modela u definiciji akcije."
diff --git a/addons/base_report_creator/i18n/hu.po b/addons/base_report_creator/i18n/hu.po
index 5a8c033a3fb..225572e6ad2 100644
--- a/addons/base_report_creator/i18n/hu.po
+++ b/addons/base_report_creator/i18n/hu.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -126,11 +126,6 @@ msgstr ""
 msgid "No Related Models!!"
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -141,6 +136,11 @@ msgstr ""
 msgid "Sum"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -194,8 +194,8 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
 msgstr ""
 
 #. module: base_report_creator
@@ -236,6 +236,11 @@ msgstr ""
 msgid "AND"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -321,13 +326,6 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -377,9 +375,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
 
 #. module: base_report_creator
@@ -408,8 +405,10 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
 msgstr ""
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/id.po b/addons/base_report_creator/i18n/id.po
index b66c2ec236f..fa574b8e25b 100644
--- a/addons/base_report_creator/i18n/id.po
+++ b/addons/base_report_creator/i18n/id.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-09 13:46+0000\n"
 "Last-Translator: <>\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-10-30 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -126,11 +126,6 @@ msgstr ""
 msgid "No Related Models!!"
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -141,6 +136,11 @@ msgstr ""
 msgid "Sum"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -194,8 +194,8 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
 msgstr ""
 
 #. module: base_report_creator
@@ -236,6 +236,11 @@ msgstr ""
 msgid "AND"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -321,13 +326,6 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -377,9 +375,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
 
 #. module: base_report_creator
@@ -408,8 +405,10 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
 msgstr ""
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/it.po b/addons/base_report_creator/i18n/it.po
index 2e8d22c8b05..f9b2dd02acc 100644
--- a/addons/base_report_creator/i18n/it.po
+++ b/addons/base_report_creator/i18n/it.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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-22 07:27+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-11-23 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -131,11 +131,6 @@ msgstr "Report Personalizzati"
 msgid "No Related Models!!"
 msgstr "Nessun modello correlato!!"
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome modello non valido nella definizione dell'azione."
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -146,6 +141,11 @@ msgstr "Informazioni Menu"
 msgid "Sum"
 msgstr "Somma"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -161,11 +161,6 @@ msgstr "Lista Campi"
 msgid "Report Type"
 msgstr "Tipo Report"
 
-#. module: base_report_creator
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "L'ID certificato del modulo deve essere unico!"
-
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Add filter"
@@ -204,9 +199,9 @@ msgid "Starting Date"
 msgstr "Data Inizio"
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr "Filtri sui Campi"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -247,9 +242,9 @@ msgid "AND"
 msgstr "AND"
 
 #. module: base_report_creator
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere unico!"
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
@@ -336,15 +331,6 @@ msgstr "Metodo di Raggruppamento"
 msgid "Condition"
 msgstr "Condizione"
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-"Se il campo attivo è impostato a Vero, permetterà di nascondere il report "
-"senza rimuoverlo."
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -394,17 +380,9 @@ msgid "Cancel"
 msgstr "Annulla"
 
 #. module: base_report_creator
-#: 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!"
-
-#. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -432,9 +410,11 @@ msgid "Unique Colors"
 msgstr "Colori Unici"
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
-msgstr "Filtri sui Campi"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
@@ -552,12 +532,21 @@ msgstr ""
 #~ msgid "Valid"
 #~ msgstr "Valido"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per Visualizzazione Architettura!"
+
 #~ msgid "Draft"
 #~ msgstr "Bozza"
 
 #~ msgid "Status"
 #~ msgstr "Stato"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
+
 #~ msgid "Uniq Colors"
 #~ msgstr "Colori Unici"
 
@@ -578,3 +567,22 @@ msgstr ""
 #~ "\n"
 #~ "Dopo l'installazione del modulo, viene aggiunta una voce di menù, nella "
 #~ "sezione \"Dashboard\", per definire un Report personalizzato.\n"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome modello non valido nella definizione dell'azione."
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the report "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Se il campo attivo è impostato a Vero, permetterà di nascondere il report "
+#~ "senza rimuoverlo."
+
+#~ 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 certificate ID of the module must be unique !"
+#~ msgstr "L'ID certificato del modulo deve essere unico!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Il nome del modulo deve essere unico!"
diff --git a/addons/base_report_creator/i18n/ko.po b/addons/base_report_creator/i18n/ko.po
index 8e7cac7559c..be410c91b3f 100644
--- a/addons/base_report_creator/i18n/ko.po
+++ b/addons/base_report_creator/i18n/ko.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-08 16:28+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-10-30 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -127,11 +127,6 @@ msgstr ""
 msgid "No Related Models!!"
 msgstr "관련된 모듈이 없음!"
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -142,6 +137,11 @@ msgstr "메뉴 정보"
 msgid "Sum"
 msgstr "합계"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -195,9 +195,9 @@ msgid "Starting Date"
 msgstr "시작 날짜"
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr "필드에 적용할 필터"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -237,6 +237,11 @@ msgstr "메뉴 이름"
 msgid "AND"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -322,13 +327,6 @@ msgstr "그룹화 방법"
 msgid "Condition"
 msgstr "조건"
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -378,9 +376,8 @@ msgid "Cancel"
 msgstr "취소"
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
 
 #. module: base_report_creator
@@ -409,9 +406,11 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
-msgstr "필드에 적용할 필터"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
diff --git a/addons/base_report_creator/i18n/lt.po b/addons/base_report_creator/i18n/lt.po
index 5a8c033a3fb..225572e6ad2 100644
--- a/addons/base_report_creator/i18n/lt.po
+++ b/addons/base_report_creator/i18n/lt.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -126,11 +126,6 @@ msgstr ""
 msgid "No Related Models!!"
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -141,6 +136,11 @@ msgstr ""
 msgid "Sum"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -194,8 +194,8 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
 msgstr ""
 
 #. module: base_report_creator
@@ -236,6 +236,11 @@ msgstr ""
 msgid "AND"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -321,13 +326,6 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -377,9 +375,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
 
 #. module: base_report_creator
@@ -408,8 +405,10 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
 msgstr ""
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/nl.po b/addons/base_report_creator/i18n/nl.po
index 4d11229f87b..f475da8fa1f 100644
--- a/addons/base_report_creator/i18n/nl.po
+++ b/addons/base_report_creator/i18n/nl.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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-27 07:18+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-11-28 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -131,11 +131,6 @@ msgstr "Eigen overzichten"
 msgid "No Related Models!!"
 msgstr "Geen gerelateerde modellen"
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de actie-definitie."
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -146,6 +141,11 @@ msgstr "Menu informatie"
 msgid "Sum"
 msgstr "Som"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -161,11 +161,6 @@ msgstr "Veldenlijst"
 msgid "Report Type"
 msgstr "Soort overzicht"
 
-#. module: base_report_creator
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Add filter"
@@ -204,9 +199,9 @@ msgid "Starting Date"
 msgstr "Begindatum"
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr "Filters op velden"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -247,9 +242,9 @@ msgid "AND"
 msgstr "EN"
 
 #. module: base_report_creator
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "De modulenaam moet uniek zijn !"
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
@@ -336,15 +331,6 @@ msgstr "Groeperingsmethode"
 msgid "Condition"
 msgstr "Voorwaarde"
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-"Als het actief veld aanstaat, kunt u het overzicht verbergen zonder het te "
-"verwijderen."
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -394,16 +380,9 @@ msgid "Cancel"
 msgstr "Annuleren"
 
 #. module: base_report_creator
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -431,9 +410,11 @@ msgid "Unique Colors"
 msgstr "Unieke kleuren"
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
-msgstr "Filters op velden"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
@@ -557,6 +538,17 @@ msgstr ""
 #~ msgid "Status"
 #~ msgstr "Status"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ongeldige modelnaam in de actie-definitie."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML voor weergave!"
+
+#~ 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 "Reports"
 #~ msgstr "Overzichten"
 
@@ -577,3 +569,19 @@ msgstr ""
 #~ "\n"
 #~ "Na installatie voegt het een menu toe om eigen overzichten te maken in\n"
 #~ "het 'Dashboard'-menu.\n"
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the report "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Als het actief veld aanstaat, kunt u het overzicht verbergen zonder het te "
+#~ "verwijderen."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/base_report_creator/i18n/nl_BE.po b/addons/base_report_creator/i18n/nl_BE.po
index b4fa1ac4331..ed0fe7f9d12 100644
--- a/addons/base_report_creator/i18n/nl_BE.po
+++ b/addons/base_report_creator/i18n/nl_BE.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-04-14 02:36+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-10-30 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -126,11 +126,6 @@ msgstr ""
 msgid "No Related Models!!"
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -141,6 +136,11 @@ msgstr ""
 msgid "Sum"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -194,8 +194,8 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
 msgstr ""
 
 #. module: base_report_creator
@@ -236,6 +236,11 @@ msgstr ""
 msgid "AND"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -321,13 +326,6 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -377,11 +375,9 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -409,8 +405,10 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
 msgstr ""
 
 #. module: base_report_creator
@@ -515,3 +513,8 @@ msgid ""
 "After installing the module, it adds a menu to define custom report in\n"
 "the \"Dashboard\" menu.\n"
 msgstr ""
+
+#~ 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 karakters bevatten !"
diff --git a/addons/base_report_creator/i18n/pl.po b/addons/base_report_creator/i18n/pl.po
index 873647f6063..cc5b050d402 100644
--- a/addons/base_report_creator/i18n/pl.po
+++ b/addons/base_report_creator/i18n/pl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:38+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -126,11 +126,6 @@ msgstr ""
 msgid "No Related Models!!"
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -141,6 +136,11 @@ msgstr "Menu informacji"
 msgid "Sum"
 msgstr "Suma"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -194,9 +194,9 @@ msgid "Starting Date"
 msgstr "Data rozpoczęcia"
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr ""
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -236,6 +236,11 @@ msgstr "Nazwa Menu"
 msgid "AND"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -321,13 +326,6 @@ msgstr "Metoda grupowania"
 msgid "Condition"
 msgstr "Warunek"
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -377,12 +375,9 @@ msgid "Cancel"
 msgstr "Anuluj"
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
-"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-"specjalnych !"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -410,8 +405,10 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
 msgstr ""
 
 #. module: base_report_creator
@@ -520,6 +517,15 @@ msgstr ""
 #~ msgid "State"
 #~ msgstr "Stan"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#~ 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 "Status"
 #~ msgstr "Stan"
 
diff --git a/addons/base_report_creator/i18n/pt.po b/addons/base_report_creator/i18n/pt.po
index e115274bcef..cd396cbc1ae 100644
--- a/addons/base_report_creator/i18n/pt.po
+++ b/addons/base_report_creator/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-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/pt_BR.po b/addons/base_report_creator/i18n/pt_BR.po
index 88dae5ea25d..7c67aea6840 100644
--- a/addons/base_report_creator/i18n/pt_BR.po
+++ b/addons/base_report_creator/i18n/pt_BR.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/ro.po b/addons/base_report_creator/i18n/ro.po
index 191946236f9..8ea00290e92 100644
--- a/addons/base_report_creator/i18n/ro.po
+++ b/addons/base_report_creator/i18n/ro.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-12 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/ru.po b/addons/base_report_creator/i18n/ru.po
index f54a33e82ce..5a77f4590fb 100644
--- a/addons/base_report_creator/i18n/ru.po
+++ b/addons/base_report_creator/i18n/ru.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-09 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/sk.po b/addons/base_report_creator/i18n/sk.po
index 08de0a3baa5..addd11d33e7 100644
--- a/addons/base_report_creator/i18n/sk.po
+++ b/addons/base_report_creator/i18n/sk.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 02:39+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -127,11 +127,6 @@ msgstr "Vlastné reporty"
 msgid "No Related Models!!"
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -142,6 +137,11 @@ msgstr "Informácia ponuky"
 msgid "Sum"
 msgstr "Suma"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -195,9 +195,9 @@ msgid "Starting Date"
 msgstr "Počiatočný dátum"
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neplatný súbor XML pre zobrazenie architektúry!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr ""
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -237,6 +237,11 @@ msgstr "Názov ponuky"
 msgid "AND"
 msgstr "AND"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -322,13 +327,6 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -378,9 +376,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
 
 #. module: base_report_creator
@@ -409,8 +406,10 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
 msgstr ""
 
 #. module: base_report_creator
@@ -521,3 +520,6 @@ msgstr ""
 
 #~ msgid "State"
 #~ msgstr "Štát"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neplatný súbor XML pre zobrazenie architektúry!"
diff --git a/addons/base_report_creator/i18n/sl.po b/addons/base_report_creator/i18n/sl.po
index 4e4b79d15b1..d7fc9295076 100644
--- a/addons/base_report_creator/i18n/sl.po
+++ b/addons/base_report_creator/i18n/sl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 12: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-10-31 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -130,11 +130,6 @@ msgstr "Lastna poročila"
 msgid "No Related Models!!"
 msgstr "Ni povezanih modelov!"
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Napačno ime modela v definiciji dejanja."
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -145,6 +140,11 @@ msgstr "Informacije o meniju"
 msgid "Sum"
 msgstr "Vsota"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -198,9 +198,9 @@ msgid "Starting Date"
 msgstr "Začetni datum"
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr "Filtri na poljih"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -240,6 +240,11 @@ msgstr "Naziv menuja"
 msgid "AND"
 msgstr "IN"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -325,13 +330,6 @@ msgstr "Način združevanja"
 msgid "Condition"
 msgstr "Pogoj"
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -381,11 +379,9 @@ msgid "Cancel"
 msgstr "Prekliči"
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -413,9 +409,11 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
-msgstr "Filtri na poljih"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
@@ -520,6 +518,14 @@ msgid ""
 "the \"Dashboard\" menu.\n"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
+
 #~ msgid "Valid"
 #~ msgstr "Veljaven"
 
@@ -535,6 +541,9 @@ msgstr ""
 #~ msgid "Reports"
 #~ msgstr "Poročila"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Napačno ime modela v definiciji dejanja."
+
 #~ msgid "Uniq Colors"
 #~ msgstr "Unikatne barve"
 
diff --git a/addons/base_report_creator/i18n/sq.po b/addons/base_report_creator/i18n/sq.po
index 2658dd8f562..1d2a8fd11f2 100644
--- a/addons/base_report_creator/i18n/sq.po
+++ b/addons/base_report_creator/i18n/sq.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -127,11 +127,6 @@ msgstr ""
 msgid "No Related Models!!"
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -142,6 +137,11 @@ msgstr ""
 msgid "Sum"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -195,8 +195,8 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
 msgstr ""
 
 #. module: base_report_creator
@@ -237,6 +237,11 @@ msgstr ""
 msgid "AND"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -322,13 +327,6 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -378,9 +376,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
 
 #. module: base_report_creator
@@ -409,8 +406,10 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
 msgstr ""
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/sr.po b/addons/base_report_creator/i18n/sr.po
index 9616b405ee9..a5150540b8a 100644
--- a/addons/base_report_creator/i18n/sr.po
+++ b/addons/base_report_creator/i18n/sr.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-29 09:37+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-10-30 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -131,11 +131,6 @@ msgstr "Prilagođeni izvještaji"
 msgid "No Related Models!!"
 msgstr "Nema srodnih modela!!"
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Pogrešno ime modela u definiciji akcije."
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -146,6 +141,11 @@ msgstr "Informacije Menija"
 msgid "Sum"
 msgstr "Suma"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -199,9 +199,9 @@ msgid "Starting Date"
 msgstr "Početni datum"
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za pregled arhitekture"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr "Filteri na poljima"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -241,6 +241,11 @@ msgstr "Naziv Menija"
 msgid "AND"
 msgstr "I"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -326,15 +331,6 @@ msgstr "Metod grupisanja"
 msgid "Condition"
 msgstr "Uslov"
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-"ako je aktivno polje postavljeno na 'istina', ono ti omogucava da sakrijes "
-"izvetaj bez uklanjanja."
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -384,11 +380,9 @@ msgid "Cancel"
 msgstr "Otkaži"
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
-"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -416,9 +410,11 @@ msgid "Unique Colors"
 msgstr "Jedinstvane Boje"
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
-msgstr "Filteri na poljima"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
@@ -530,18 +526,29 @@ msgstr ""
 "izvestaj u\n"
 "meniju \" Glavne Table\".\n"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Pogrešno ime modela u definiciji akcije."
+
 #~ msgid "Valid"
 #~ msgstr "Potvrđeno"
 
 #~ msgid "State"
 #~ msgstr "Stanje"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nevažeći XML za pregled arhitekture"
+
 #~ msgid "Status"
 #~ msgstr "Status"
 
 #~ msgid "Draft"
 #~ msgstr "Priprema"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
 #~ msgid "Uniq Colors"
 #~ msgstr "Jedinstvene boje"
 
@@ -562,3 +569,10 @@ msgstr ""
 
 #~ msgid "Reports"
 #~ msgstr "Izveštaji"
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the report "
+#~ "without removing it."
+#~ msgstr ""
+#~ "ako je aktivno polje postavljeno na 'istina', ono ti omogucava da sakrijes "
+#~ "izvetaj bez uklanjanja."
diff --git a/addons/base_report_creator/i18n/sr@latin.po b/addons/base_report_creator/i18n/sr@latin.po
index 5207e02384c..e90a5acc51a 100644
--- a/addons/base_report_creator/i18n/sr@latin.po
+++ b/addons/base_report_creator/i18n/sr@latin.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-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/sv.po b/addons/base_report_creator/i18n/sv.po
index 8beae9cb31d..12041b12c3b 100644
--- a/addons/base_report_creator/i18n/sv.po
+++ b/addons/base_report_creator/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-22 21:01+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <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-11-23 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -131,11 +131,6 @@ msgstr "Custom Reports"
 msgid "No Related Models!!"
 msgstr "No Related Models!!"
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Invalid model name in the action definition."
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -146,6 +141,11 @@ msgstr "Menu Information"
 msgid "Sum"
 msgstr "Sum"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -161,11 +161,6 @@ msgstr "Field List"
 msgid "Report Type"
 msgstr "Report Type"
 
-#. module: base_report_creator
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Add filter"
@@ -204,9 +199,9 @@ msgid "Starting Date"
 msgstr "Starting Date"
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr "Filters on Fields"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -247,8 +242,8 @@ msgid "AND"
 msgstr "AND"
 
 #. module: base_report_creator
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
 msgstr ""
 
 #. module: base_report_creator
@@ -336,13 +331,6 @@ msgstr "Grouping Method"
 msgid "Condition"
 msgstr "Condition"
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -392,17 +380,10 @@ msgid "Cancel"
 msgstr "Cancel"
 
 #. module: base_report_creator
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
 msgid "Menu"
@@ -429,9 +410,11 @@ msgid "Unique Colors"
 msgstr "Unique Colors"
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
-msgstr "Filters on Fields"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
@@ -536,9 +519,17 @@ msgid ""
 "the \"Dashboard\" menu.\n"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
 #~ msgid "UserError"
 #~ msgstr "UserError"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Invalid model name in the action definition."
+
 #~ msgid "State"
 #~ msgstr "State"
 
@@ -551,6 +542,9 @@ msgstr ""
 #~ msgid "No Wizards available for this object!"
 #~ msgstr "No Wizards available for this object!"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalid XML for View Architecture!"
+
 #~ msgid "Draft"
 #~ msgstr "Draft"
 
diff --git a/addons/base_report_creator/i18n/tlh.po b/addons/base_report_creator/i18n/tlh.po
index 9ff8b7d733e..66d836b4b3c 100644
--- a/addons/base_report_creator/i18n/tlh.po
+++ b/addons/base_report_creator/i18n/tlh.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -126,11 +126,6 @@ msgstr ""
 msgid "No Related Models!!"
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -141,6 +136,11 @@ msgstr ""
 msgid "Sum"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -194,8 +194,8 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
 msgstr ""
 
 #. module: base_report_creator
@@ -236,6 +236,11 @@ msgstr ""
 msgid "AND"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -321,13 +326,6 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -377,9 +375,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
 
 #. module: base_report_creator
@@ -408,8 +405,10 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
 msgstr ""
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/tr.po b/addons/base_report_creator/i18n/tr.po
index e20fd6bc18f..adb748aefd3 100644
--- a/addons/base_report_creator/i18n/tr.po
+++ b/addons/base_report_creator/i18n/tr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-09 07:11+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-10-30 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -126,11 +126,6 @@ msgstr "Özel Raporlar"
 msgid "No Related Models!!"
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -141,6 +136,11 @@ msgstr "Menü Bilgisi"
 msgid "Sum"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -194,9 +194,9 @@ msgid "Starting Date"
 msgstr "Başlangıç Tarihi"
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr ""
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -236,6 +236,11 @@ msgstr "Menü Adı"
 msgid "AND"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -321,13 +326,6 @@ msgstr ""
 msgid "Condition"
 msgstr "Koşul"
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -377,9 +375,8 @@ msgid "Cancel"
 msgstr "İptal"
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
 
 #. module: base_report_creator
@@ -408,8 +405,10 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
 msgstr ""
 
 #. module: base_report_creator
@@ -515,6 +514,9 @@ msgid ""
 "the \"Dashboard\" menu.\n"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
+
 #~ msgid "State"
 #~ msgstr "Durum"
 
diff --git a/addons/base_report_creator/i18n/uk.po b/addons/base_report_creator/i18n/uk.po
index 878172daa06..477b54b4f3f 100644
--- a/addons/base_report_creator/i18n/uk.po
+++ b/addons/base_report_creator/i18n/uk.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-08 13:33+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@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-10-30 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -126,11 +126,6 @@ msgstr ""
 msgid "No Related Models!!"
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -141,6 +136,11 @@ msgstr ""
 msgid "Sum"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -194,9 +194,9 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури Вигляду!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr ""
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -236,6 +236,11 @@ msgstr ""
 msgid "AND"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -321,13 +326,6 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -377,11 +375,9 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
-"Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -409,8 +405,10 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
 msgstr ""
 
 #. module: base_report_creator
@@ -515,3 +513,11 @@ msgid ""
 "After installing the module, it adds a menu to define custom report in\n"
 "the \"Dashboard\" menu.\n"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильний XML для Архітектури Вигляду!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
diff --git a/addons/base_report_creator/i18n/vi.po b/addons/base_report_creator/i18n/vi.po
index 15779465d66..ae3aa522b6a 100644
--- a/addons/base_report_creator/i18n/vi.po
+++ b/addons/base_report_creator/i18n/vi.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-10-30 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -127,11 +127,6 @@ msgstr ""
 msgid "No Related Models!!"
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -142,6 +137,11 @@ msgstr ""
 msgid "Sum"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -195,8 +195,8 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
 msgstr ""
 
 #. module: base_report_creator
@@ -237,6 +237,11 @@ msgstr ""
 msgid "AND"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -322,13 +327,6 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -378,9 +376,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
 
 #. module: base_report_creator
@@ -409,8 +406,10 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
 msgstr ""
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/zh_CN.po b/addons/base_report_creator/i18n/zh_CN.po
index 192ffa48794..fafdfdaff53 100644
--- a/addons/base_report_creator/i18n/zh_CN.po
+++ b/addons/base_report_creator/i18n/zh_CN.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 02:41+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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-10-30 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -126,11 +126,6 @@ msgstr "自定义报表"
 msgid "No Related Models!!"
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "在动作定义中使用了无效的模快名。"
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -141,6 +136,11 @@ msgstr "菜单信息"
 msgid "Sum"
 msgstr "合计"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -194,9 +194,9 @@ msgid "Starting Date"
 msgstr "开始日期"
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效的视图结构xml文件!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr "过滤字段"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -236,6 +236,11 @@ msgstr "菜单名称"
 msgid "AND"
 msgstr "与（AND）"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -321,13 +326,6 @@ msgstr "分组方式"
 msgid "Condition"
 msgstr "条件"
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -377,10 +375,9 @@ msgid "Cancel"
 msgstr "取消"
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
+msgstr ""
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -408,9 +405,11 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
-msgstr "过滤字段"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
@@ -530,9 +529,19 @@ msgstr ""
 #~ msgid "Valid"
 #~ msgstr "有效"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+
 #~ msgid "Uniq Colors"
 #~ msgstr "颜色"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "在动作定义中使用了无效的模快名。"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效的视图结构xml文件!"
+
 #~ msgid ""
 #~ "This modules allows you to create any statistic\n"
 #~ "report on several object. It's a SQL query builder and browser\n"
diff --git a/addons/base_report_creator/i18n/zh_TW.po b/addons/base_report_creator/i18n/zh_TW.po
index c379cd2d636..c494429c010 100644
--- a/addons/base_report_creator/i18n/zh_TW.po
+++ b/addons/base_report_creator/i18n/zh_TW.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-01-30 12:43+0000\n"
 "Last-Translator: <>\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-10-30 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -126,11 +126,6 @@ msgstr ""
 msgid "No Related Models!!"
 msgstr ""
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -141,6 +136,11 @@ msgstr ""
 msgid "Sum"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -194,8 +194,8 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
 msgstr ""
 
 #. module: base_report_creator
@@ -236,6 +236,11 @@ msgstr ""
 msgid "AND"
 msgstr ""
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
@@ -321,13 +326,6 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -377,9 +375,8 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
 
 #. module: base_report_creator
@@ -408,8 +405,10 @@ msgid "Unique Colors"
 msgstr ""
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
 msgstr ""
 
 #. module: base_report_creator
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/ar.po b/addons/base_report_designer/i18n/ar.po
index 52962199d15..32a6d3e4370 100644
--- a/addons/base_report_designer/i18n/ar.po
+++ b/addons/base_report_designer/i18n/ar.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 02:42+0000\n"
 "Last-Translator: Akram Obeidat <akram@teiseer.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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,25 +21,14 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-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
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
 msgstr ""
 
 #. module: base_report_designer
@@ -47,11 +36,6 @@ msgstr ""
 msgid "The .SXW report"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -98,15 +82,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr "مصمم تقارير"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -118,11 +93,6 @@ msgstr ""
 msgid "Get a report"
 msgstr ""
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -166,6 +136,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
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/bg.po b/addons/base_report_designer/i18n/bg.po
index dc42a6fd6f1..af339163bb4 100644
--- a/addons/base_report_designer/i18n/bg.po
+++ b/addons/base_report_designer/i18n/bg.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2008-09-29 01:07+0000\n"
 "Last-Translator: Tsvetin Vasilev <cecipv@yahoo.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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,37 +21,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-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
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Качи изменената справка"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr "Справката в формат .SXW"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -98,15 +82,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr "Оформление на справка"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -118,11 +93,6 @@ msgstr ""
 msgid "Get a report"
 msgstr "Вземи справка"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Качи изменената справка"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -166,6 +136,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/bs.po b/addons/base_report_designer/i18n/bs.po
index c045424db1e..a91cddceaae 100644
--- a/addons/base_report_designer/i18n/bs.po
+++ b/addons/base_report_designer/i18n/bs.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,25 +21,14 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-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
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
 msgstr ""
 
 #. module: base_report_designer
@@ -47,11 +36,6 @@ msgstr ""
 msgid "The .SXW report"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -98,15 +82,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr ""
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -118,11 +93,6 @@ msgstr ""
 msgid "Get a report"
 msgstr ""
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -166,6 +136,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/ca.po b/addons/base_report_designer/i18n/ca.po
index 069cf90f4cb..8cee419ade2 100644
--- a/addons/base_report_designer/i18n/ca.po
+++ b/addons/base_report_designer/i18n/ca.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 02:42+0000\n"
 "Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,37 +21,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
 msgstr "Mòdul que proporciona una interfície per al dissenyador d'informes"
 
 #. module: base_report_designer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Puja l'informe modificat"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr "L'informe .SXW"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -98,15 +82,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr "Dissenyador d'informes"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -118,11 +93,6 @@ msgstr ""
 msgid "Get a report"
 msgstr "Obté un informe"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Puja l'informe modificat"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -166,6 +136,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/cs.po b/addons/base_report_designer/i18n/cs.po
index 9f9f48c79d8..6600cf1cd57 100644
--- a/addons/base_report_designer/i18n/cs.po
+++ b/addons/base_report_designer/i18n/cs.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-17 08:52+0000\n"
 "Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,37 +21,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-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
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Nahrát upravený report"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr ".SXW report"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -98,15 +82,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr "Návrhář reportů"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -118,11 +93,6 @@ msgstr ""
 msgid "Get a report"
 msgstr "Chci report"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Nahrát upravený report"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -166,6 +136,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/de.po b/addons/base_report_designer/i18n/de.po
index 854caee485f..016226d98c5 100644
--- a/addons/base_report_designer/i18n/de.po
+++ b/addons/base_report_designer/i18n/de.po
@@ -6,7 +6,7 @@ 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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-30 18:19+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -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-01 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -22,43 +22,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Das Objekt muss mit einem x_ starten und darf keine Sonderzeichen haben!"
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
 msgstr "Berichts Designer Module"
 
 #. module: base_report_designer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Quellcode für diese Ansicht !"
-
-#. module: base_report_designer
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Upload Reportmodifikation"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr "Der .SXW Report"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -89,11 +67,6 @@ msgstr "Konfiguriere"
 msgid "title"
 msgstr ""
 
-#. module: base_report_designer
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein !"
-
 #. module: base_report_designer
 #: field:base.report.file.sxw,report_id:0
 #: field:base.report.sxw,report_id:0
@@ -105,11 +78,6 @@ msgstr "Bericht"
 msgid "base.report.rml.save"
 msgstr ""
 
-#. module: base_report_designer
-#: 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 !"
-
 #. module: base_report_designer
 #: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
 msgid "Report Designer"
@@ -126,11 +94,6 @@ msgstr "Datei Name"
 msgid "Get a report"
 msgstr "Generiere Report"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Upload Reportmodifikation"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -216,11 +179,6 @@ msgstr ""
 msgid "OpenObject Report Designer Plug-in"
 msgstr "OpenObject Report Designer Plug-in"
 
-#. module: base_report_designer
-#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
 msgid "OpenERP Report Designer Installation"
@@ -234,9 +192,9 @@ msgid "Cancel"
 msgstr "Abbruch"
 
 #. module: base_report_designer
-#: 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 !"
+#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
 
 #. module: base_report_designer
 #: view:base.report.sxw:0
@@ -289,3 +247,29 @@ msgstr "Wählen Sie Ihren Report"
 #~ ".SXW Datei und öffnen diesen mit OpenOffice. Vergessen Sie nicht das OpenERP "
 #~ "OpenOffice Paket zu installieren. Nach der Änderung verwenden Sie diesen "
 #~ "Assistenten um den Bericht in OpenERP zu laden."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Das Objekt muss mit einem x_ starten und darf keine Sonderzeichen haben!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Quellcode für diese Ansicht !"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ 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 certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/base_report_designer/i18n/el.po b/addons/base_report_designer/i18n/el.po
index 749288192aa..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-14 05:23+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/i18n/es.po b/addons/base_report_designer/i18n/es.po
index d9a7daba0fd..5cf6228b852 100644
--- a/addons/base_report_designer/i18n/es.po
+++ b/addons/base_report_designer/i18n/es.po
@@ -6,7 +6,7 @@ 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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-23 09:33+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -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-11-24 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -22,44 +22,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr "base.informe.sxw"
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
 msgstr "Módulo que proporciona una interfaz para el diseñador de informes"
 
 #. module: base_report_designer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la estructura de la vista!"
-
-#. module: base_report_designer
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Subir el informe modificado"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr "El informe .SXW"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -90,11 +67,6 @@ msgstr "Configurar"
 msgid "title"
 msgstr "título"
 
-#. module: base_report_designer
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "¡El nombre del grupo debe ser único!"
-
 #. module: base_report_designer
 #: field:base.report.file.sxw,report_id:0
 #: field:base.report.sxw,report_id:0
@@ -106,11 +78,6 @@ msgstr "Informe"
 msgid "base.report.rml.save"
 msgstr "base.informe.rml.guardar"
 
-#. module: base_report_designer
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: base_report_designer
 #: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
 msgid "Report Designer"
@@ -127,11 +94,6 @@ msgstr "Nombre fichero"
 msgid "Get a report"
 msgstr "Obtener un informe"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Subir el informe modificado"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -216,11 +178,6 @@ msgstr "base.informe.fichero.sxw"
 msgid "OpenObject Report Designer Plug-in"
 msgstr "Plug-in diseñador informe OpenObject"
 
-#. module: base_report_designer
-#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
-msgstr "ir.acciones.informe.xml"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
 msgid "OpenERP Report Designer Installation"
@@ -234,9 +191,9 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base_report_designer
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.acciones.informe.xml"
 
 #. module: base_report_designer
 #: view:base.report.sxw:0
@@ -289,3 +246,30 @@ msgstr "Selecciona su informe"
 
 #~ msgid "Report designer introduction"
 #~ msgstr "Introducción al diseñador de informes"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura de la vista!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "¡El nombre del grupo debe ser único!"
diff --git a/addons/base_report_designer/i18n/es_AR.po b/addons/base_report_designer/i18n/es_AR.po
index 525ff6a4c40..00b5baee64b 100644
--- a/addons/base_report_designer/i18n/es_AR.po
+++ b/addons/base_report_designer/i18n/es_AR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-15 19:44+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,37 +21,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
 msgstr "Módulo interfaz del diseñador de reportes"
 
 #. module: base_report_designer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Subir el reporte modificado"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr "El informe .SXW"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -98,15 +82,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr "Diseñador de reportes"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -118,11 +93,6 @@ msgstr ""
 msgid "Get a report"
 msgstr "Obtener un reporte"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Subir el reporte modificado"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -166,6 +136,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/es_EC.po b/addons/base_report_designer/i18n/es_EC.po
index e63b6ca555f..0293b73919b 100644
--- a/addons/base_report_designer/i18n/es_EC.po
+++ b/addons/base_report_designer/i18n/es_EC.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-17 19:09+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,37 +21,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
 msgstr "Módulo que proporciona una interfaz para el diseñador de informes"
 
 #. module: base_report_designer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Subir el informe modificado"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr "El informe .SXW"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -98,15 +82,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr "Diseñador de informes"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -118,11 +93,6 @@ msgstr ""
 msgid "Get a report"
 msgstr "Obtener un informe"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Subir el informe modificado"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -166,6 +136,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/et.po b/addons/base_report_designer/i18n/et.po
index dc349cf6a70..7e24fbf0e8a 100644
--- a/addons/base_report_designer/i18n/et.po
+++ b/addons/base_report_designer/i18n/et.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-09 16:47+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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,37 +21,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
 msgstr "Aruande disaniliidese moodul"
 
 #. module: base_report_designer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Lae üles muudetud aruanne"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr ".SXW aruanne"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -98,15 +82,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr "Aruande koostaja"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -118,11 +93,6 @@ msgstr ""
 msgid "Get a report"
 msgstr "Saa aruanne"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Lae üles muudetud aruanne"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -166,6 +136,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/fi.po b/addons/base_report_designer/i18n/fi.po
index e4383524803..d9053824b05 100644
--- a/addons/base_report_designer/i18n/fi.po
+++ b/addons/base_report_designer/i18n/fi.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 03:44+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: Finnish <fi@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:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -22,37 +22,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
 msgstr "Raportinsuunnittelijan käyttöliittymä moduuli"
 
 #. module: base_report_designer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Lähetä muokattu raportti"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr ".SXW-raportti"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -99,15 +83,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr "Raportin muotoilija"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -119,11 +94,6 @@ msgstr ""
 msgid "Get a report"
 msgstr "Hanki raportti"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Lähetä muokattu raportti"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -167,6 +137,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/fr.po b/addons/base_report_designer/i18n/fr.po
index f7b6054ba08..9f423221510 100644
--- a/addons/base_report_designer/i18n/fr.po
+++ b/addons/base_report_designer/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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-09 16:47+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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,37 +21,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
 msgstr "Module d'interface du Concepteur de Rapport"
 
 #. module: base_report_designer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Upload le rapport modifié"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr "Rapport .SXW"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -98,15 +82,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr "Concepteur de rapports"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -118,11 +93,6 @@ msgstr ""
 msgid "Get a report"
 msgstr "Recevoir un rapport"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Upload le rapport modifié"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -166,6 +136,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/gl.po b/addons/base_report_designer/i18n/gl.po
index 89006109826..941a03fa2aa 100644
--- a/addons/base_report_designer/i18n/gl.po
+++ b/addons/base_report_designer/i18n/gl.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: base-report-designer-gl\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-08 12:44+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -23,37 +23,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
 msgstr "Módulo interface para o deseñador de informes"
 
 #. module: base_report_designer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Subir o informe modificado"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr "O informe .SXW"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -100,15 +84,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr "Deseñador de informes"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -120,11 +95,6 @@ msgstr ""
 msgid "Get a report"
 msgstr "Obter un informe"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Subir o informe modificado"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -168,6 +138,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/hr.po b/addons/base_report_designer/i18n/hr.po
index 2235c64e843..2f3c7b1aa2d 100644
--- a/addons/base_report_designer/i18n/hr.po
+++ b/addons/base_report_designer/i18n/hr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 03:44+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: Vinteh\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:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
@@ -22,37 +22,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
 msgstr "Modul sučelja Dizajnera Izvještaja"
 
 #. module: base_report_designer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Pošalji promijenjen Izvještaj na Server"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr ".SXW Izvještaj"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -99,15 +83,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr "Dizajner Izvještaja"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -119,11 +94,6 @@ msgstr ""
 msgid "Get a report"
 msgstr "Napravi Izvještaj"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Pošalji promijenjen Izvještaj na Server"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -167,6 +137,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/hu.po b/addons/base_report_designer/i18n/hu.po
index c045424db1e..a91cddceaae 100644
--- a/addons/base_report_designer/i18n/hu.po
+++ b/addons/base_report_designer/i18n/hu.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,25 +21,14 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-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
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
 msgstr ""
 
 #. module: base_report_designer
@@ -47,11 +36,6 @@ msgstr ""
 msgid "The .SXW report"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -98,15 +82,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr ""
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -118,11 +93,6 @@ msgstr ""
 msgid "Get a report"
 msgstr ""
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -166,6 +136,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/id.po b/addons/base_report_designer/i18n/id.po
index 0bc5e1ab8fb..e01b50695cf 100644
--- a/addons/base_report_designer/i18n/id.po
+++ b/addons/base_report_designer/i18n/id.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 03:45+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,37 +21,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
 msgstr "Modul antarmuka desainer laporan"
 
 #. module: base_report_designer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Unggah laporan yang telah dimodifikasi"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr "Laporan .SXW"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -98,15 +82,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr "Desainer Laporan"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -118,11 +93,6 @@ msgstr ""
 msgid "Get a report"
 msgstr "Ambil laporan"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Unggah laporan yang telah dimodifikasi"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -166,6 +136,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/it.po b/addons/base_report_designer/i18n/it.po
index d6775c88067..03827c9b74e 100644
--- a/addons/base_report_designer/i18n/it.po
+++ b/addons/base_report_designer/i18n/it.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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-22 07: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-11-23 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,44 +21,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr "base.report.sxw"
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per \"x_\" e non contenere alcun "
-"carattere speciale!"
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome del modello non valido nella definizione dell'azione"
-
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
 msgstr "Modulo interfaccia di \"Report Designer\""
 
 #. module: base_report_designer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per la struttura della vista!"
-
-#. module: base_report_designer
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere unico!"
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Pubblica il tuo Report modificato"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr "Report .SXW"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Errore! Non è possibile creare un menù ricorsivo"
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -89,11 +66,6 @@ msgstr "Configura"
 msgid "title"
 msgstr "titolo"
 
-#. module: base_report_designer
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "Il nome del gruppo deve essere unico!"
-
 #. module: base_report_designer
 #: field:base.report.file.sxw,report_id:0
 #: field:base.report.sxw,report_id:0
@@ -105,11 +77,6 @@ msgstr "Report"
 msgid "base.report.rml.save"
 msgstr "base.report.rml.save"
 
-#. module: base_report_designer
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "L'ID certificato del modulo deve essere unico!"
-
 #. module: base_report_designer
 #: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
 msgid "Report Designer"
@@ -126,11 +93,6 @@ msgstr "Nome file"
 msgid "Get a report"
 msgstr "Scarica un Report"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Pubblica il tuo Report modificato"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -215,11 +177,6 @@ msgstr "base.report.file.sxw"
 msgid "OpenObject Report Designer Plug-in"
 msgstr "Plug in di OpenObject Report Designer"
 
-#. module: base_report_designer
-#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
 msgid "OpenERP Report Designer Installation"
@@ -233,9 +190,9 @@ msgid "Cancel"
 msgstr "Annulla"
 
 #. module: base_report_designer
-#: 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!"
+#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base_report_designer
 #: view:base.report.sxw:0
@@ -288,3 +245,30 @@ msgstr "Seleziona il tuo Report"
 
 #~ msgid "Report designer introduction"
 #~ msgstr "Introduzione a Report Designer"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per \"x_\" e non contenere alcun "
+#~ "carattere speciale!"
+
+#~ 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 un menù ricorsivo"
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "Il nome del gruppo deve essere unico!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Il nome del modulo deve essere unico!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "L'ID certificato 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/base_report_designer/i18n/ko.po b/addons/base_report_designer/i18n/ko.po
index fbcd4fdc709..ea963829f02 100644
--- a/addons/base_report_designer/i18n/ko.po
+++ b/addons/base_report_designer/i18n/ko.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-08 15:49+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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -22,37 +22,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-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
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "수정된 리포트들 업로드"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr ".SWX 리포트"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -99,15 +83,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr "리포트 디자이너"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -119,11 +94,6 @@ msgstr ""
 msgid "Get a report"
 msgstr "리포트 가졍기"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "수정된 리포트들 업로드"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -167,6 +137,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/lt.po b/addons/base_report_designer/i18n/lt.po
index c045424db1e..a91cddceaae 100644
--- a/addons/base_report_designer/i18n/lt.po
+++ b/addons/base_report_designer/i18n/lt.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,25 +21,14 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-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
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
 msgstr ""
 
 #. module: base_report_designer
@@ -47,11 +36,6 @@ msgstr ""
 msgid "The .SXW report"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -98,15 +82,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr ""
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -118,11 +93,6 @@ msgstr ""
 msgid "Get a report"
 msgstr ""
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -166,6 +136,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/nl.po b/addons/base_report_designer/i18n/nl.po
index 152bfde6abe..364797a3aa0 100644
--- a/addons/base_report_designer/i18n/nl.po
+++ b/addons/base_report_designer/i18n/nl.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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-27 14:41+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-11-28 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,43 +21,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr "base.report.sxw"
 
-#. module: base_report_designer
-#: 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: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in actie definitie."
-
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
 msgstr "Rapportontwerper interface module"
 
 #. module: base_report_designer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave opbouw!"
-
-#. module: base_report_designer
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "De modulenaam moet uniek zijn !"
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Aangepast rapport uploaden"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr "het .SXW rapport"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fout ! U kunt geen recursief menu maken."
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -88,11 +66,6 @@ msgstr "Configureren"
 msgid "title"
 msgstr "titel"
 
-#. module: base_report_designer
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "De groepsnaam moet uniek zijn !"
-
 #. module: base_report_designer
 #: field:base.report.file.sxw,report_id:0
 #: field:base.report.sxw,report_id:0
@@ -104,11 +77,6 @@ msgstr "Rapport"
 msgid "base.report.rml.save"
 msgstr "base.report.rml.save"
 
-#. module: base_report_designer
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
 #. module: base_report_designer
 #: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
 msgid "Report Designer"
@@ -125,11 +93,6 @@ msgstr "Bestandsnaam"
 msgid "Get a report"
 msgstr "Rapport ophalen"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Aangepast rapport uploaden"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -215,11 +178,6 @@ msgstr "base.report.file.sxw"
 msgid "OpenObject Report Designer Plug-in"
 msgstr "OpenObject Rapport Ontwerper Plug-in"
 
-#. module: base_report_designer
-#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
 msgid "OpenERP Report Designer Installation"
@@ -233,9 +191,9 @@ msgid "Cancel"
 msgstr "Annuleren"
 
 #. module: base_report_designer
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
+#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base_report_designer
 #: view:base.report.sxw:0
@@ -288,3 +246,29 @@ msgstr "Selecteer rapport"
 
 #~ msgid "Report designer introduction"
 #~ msgstr "Introductie rapport ontwerpen"
+
+#~ 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 "Invalid model name in the action definition."
+#~ msgstr "Ongeldige modelnaam in actie definitie."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fout ! U kunt geen recursief menu maken."
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "De groepsnaam moet uniek zijn !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "De modulenaam moet uniek zijn !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/base_report_designer/i18n/nl_BE.po b/addons/base_report_designer/i18n/nl_BE.po
index 42964ac170f..571c859933d 100644
--- a/addons/base_report_designer/i18n/nl_BE.po
+++ b/addons/base_report_designer/i18n/nl_BE.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-04-24 15:40+0000\n"
 "Last-Translator: <>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,25 +21,14 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-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
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
 msgstr ""
 
 #. module: base_report_designer
@@ -47,11 +36,6 @@ msgstr ""
 msgid "The .SXW report"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -98,15 +82,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr ""
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -118,11 +93,6 @@ msgstr ""
 msgid "Get a report"
 msgstr ""
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -166,6 +136,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/pl.po b/addons/base_report_designer/i18n/pl.po
index 7af7fd729c7..a6540cbbaf7 100644
--- a/addons/base_report_designer/i18n/pl.po
+++ b/addons/base_report_designer/i18n/pl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2008-12-09 00:19+0000\n"
 "Last-Translator: Andrzej MoST (Marcin Ostajewski) <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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,25 +21,14 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-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
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
 msgstr ""
 
 #. module: base_report_designer
@@ -47,11 +36,6 @@ msgstr ""
 msgid "The .SXW report"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -98,15 +82,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr "Projektant raportów"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -118,11 +93,6 @@ msgstr ""
 msgid "Get a report"
 msgstr ""
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -166,6 +136,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/pt.po b/addons/base_report_designer/i18n/pt.po
index a13c868db6b..facdf83f827 100644
--- a/addons/base_report_designer/i18n/pt.po
+++ b/addons/base_report_designer/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-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/pt_BR.po b/addons/base_report_designer/i18n/pt_BR.po
index acde591533d..cb1fa2cc320 100644
--- a/addons/base_report_designer/i18n/pt_BR.po
+++ b/addons/base_report_designer/i18n/pt_BR.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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-12-01 08:04+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-02 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,44 +21,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr "base.report.sxw"
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-"especial!"
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da ação."
-
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
 msgstr "Módulo de Interface do Editor de Relatórios"
 
 #. module: base_report_designer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para Arquitetura da View"
-
-#. module: base_report_designer
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo precisa ser único !"
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Carregue o relatório modificado (upload)"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr "O relatório .SXW"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Erro! Você não pode criar um Menu recursivo."
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -89,11 +66,6 @@ msgstr "Configurar"
 msgid "title"
 msgstr "Título"
 
-#. module: base_report_designer
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "O nome do grupo precisa ser único!"
-
 #. module: base_report_designer
 #: field:base.report.file.sxw,report_id:0
 #: field:base.report.sxw,report_id:0
@@ -105,11 +77,6 @@ msgstr "Relatório"
 msgid "base.report.rml.save"
 msgstr "base.report.rml.save"
 
-#. module: base_report_designer
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "O ID de certificado do módulo precisa ser único !"
-
 #. module: base_report_designer
 #: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
 msgid "Report Designer"
@@ -126,11 +93,6 @@ msgstr "Nome do arquivo"
 msgid "Get a report"
 msgstr "Escolha um relatório"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Carregue o relatório modificado (upload)"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -214,11 +176,6 @@ msgstr "base.report.file.sxw"
 msgid "OpenObject Report Designer Plug-in"
 msgstr "Plug-in do Desenvolvedor de Relatórios do OpenObject"
 
-#. module: base_report_designer
-#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
 msgid "OpenERP Report Designer Installation"
@@ -232,9 +189,9 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base_report_designer
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "O tamanho do campo nunca pode ser menor que 1 !"
+#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base_report_designer
 #: view:base.report.sxw:0
@@ -287,3 +244,30 @@ msgstr "Escolha seu relatório"
 
 #~ msgid "Report designer introduction"
 #~ msgstr "Introdução ao editor de relatórios"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "O nome do módulo precisa ser único !"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
+#~ "especial!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para Arquitetura da View"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de modelo inválido na definição da ação."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Erro! Você não pode criar um Menu recursivo."
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "O nome do grupo precisa ser único!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID de certificado do módulo precisa ser único !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/base_report_designer/i18n/ro.po b/addons/base_report_designer/i18n/ro.po
index d0026f48ab1..49561e1dd6b 100644
--- a/addons/base_report_designer/i18n/ro.po
+++ b/addons/base_report_designer/i18n/ro.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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-27 03:21+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-11-28 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,44 +21,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr "base.report.sxw"
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
-"special !"
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nume invalid de model în definirea acțiunii."
-
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
 msgstr "Modul interfaţă designer de rapoarte"
 
 #. module: base_report_designer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: base_report_designer
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Numele modulului trebuie să fie unic !"
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Încărcare raport modificat"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr "Raport .SXW"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Eroare ! Nu este posibilă crearea unui meniu recursiv."
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -89,11 +66,6 @@ msgstr "Configurare"
 msgid "title"
 msgstr "titlu"
 
-#. module: base_report_designer
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "Numele grupuiui trebuie să fie unic !"
-
 #. module: base_report_designer
 #: field:base.report.file.sxw,report_id:0
 #: field:base.report.sxw,report_id:0
@@ -105,11 +77,6 @@ msgstr "Raport"
 msgid "base.report.rml.save"
 msgstr "base.report.rml.save"
 
-#. module: base_report_designer
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "ID-ul certificatului trebuie să fie unic !"
-
 #. module: base_report_designer
 #: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
 msgid "Report Designer"
@@ -126,11 +93,6 @@ msgstr "Nume fișier"
 msgid "Get a report"
 msgstr "Obţine un raport"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Încărcare raport modificat"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -210,11 +172,6 @@ msgstr "base.report.file.sxw"
 msgid "OpenObject Report Designer Plug-in"
 msgstr "Plug-in OpenObject Report Designer"
 
-#. module: base_report_designer
-#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
-msgstr "ir.actions.report.xml"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
 msgid "OpenERP Report Designer Installation"
@@ -228,9 +185,9 @@ msgid "Cancel"
 msgstr "Revocare"
 
 #. module: base_report_designer
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Lungimea acestui câmp trebuie să fie cel puţin 1 !"
+#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base_report_designer
 #: view:base.report.sxw:0
@@ -283,3 +240,27 @@ msgstr "Selectare raport"
 
 #~ msgid "Operation"
 #~ msgstr "Operație"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Numele modulului trebuie să fie unic !"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
+#~ "special !"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nume invalid de model în definirea acțiunii."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Eroare ! Nu este posibilă crearea unui meniu recursiv."
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "Numele grupuiui trebuie să fie unic !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "ID-ul certificatului trebuie să fie unic !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Lungimea acestui câmp trebuie să fie cel puţin 1 !"
diff --git a/addons/base_report_designer/i18n/ru.po b/addons/base_report_designer/i18n/ru.po
index 3c5d997d2c0..0a13cf99c82 100644
--- a/addons/base_report_designer/i18n/ru.po
+++ b/addons/base_report_designer/i18n/ru.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-12 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/sk.po b/addons/base_report_designer/i18n/sk.po
index f2c09534184..6d4ace2320b 100644
--- a/addons/base_report_designer/i18n/sk.po
+++ b/addons/base_report_designer/i18n/sk.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 03:46+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@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:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -22,25 +22,14 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-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
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
 msgstr ""
 
 #. module: base_report_designer
@@ -48,11 +37,6 @@ msgstr ""
 msgid "The .SXW report"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -99,15 +83,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr "Tvorca reportov"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -119,11 +94,6 @@ msgstr ""
 msgid "Get a report"
 msgstr ""
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -167,6 +137,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/sl.po b/addons/base_report_designer/i18n/sl.po
index d1ea45dc2fa..19ed4fd27ed 100644
--- a/addons/base_report_designer/i18n/sl.po
+++ b/addons/base_report_designer/i18n/sl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-17 08:52+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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,37 +21,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
 msgstr "Vmesnik modula za urejanje poročil"
 
 #. module: base_report_designer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Prenesi popravljeno poročilo"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr ".SXW poročilo"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -98,15 +82,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr "Oblikovalec poročil"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -118,11 +93,6 @@ msgstr ""
 msgid "Get a report"
 msgstr "Dobi poročilo"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Prenesi popravljeno poročilo"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -166,6 +136,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/sq.po b/addons/base_report_designer/i18n/sq.po
index a35e9b6008f..a69b2fee7c9 100644
--- a/addons/base_report_designer/i18n/sq.po
+++ b/addons/base_report_designer/i18n/sq.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -22,25 +22,14 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-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
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
 msgstr ""
 
 #. module: base_report_designer
@@ -48,11 +37,6 @@ msgstr ""
 msgid "The .SXW report"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -99,15 +83,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr ""
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -119,11 +94,6 @@ msgstr ""
 msgid "Get a report"
 msgstr ""
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -167,6 +137,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/sr.po b/addons/base_report_designer/i18n/sr.po
index cf78cdcabda..8af4fb91eff 100644
--- a/addons/base_report_designer/i18n/sr.po
+++ b/addons/base_report_designer/i18n/sr.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 14:22+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-10-31 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -22,38 +22,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr "base.report.sxw"
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Neispravno ime modela u definiciji akcije."
-
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
 msgstr "Modul Interfejsa Dizajnera Izveštaja"
 
 #. module: base_report_designer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neispravan XML za pregled arhitekture!"
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Pošalji promenjen izveštaj na Server"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr ".SXW Izveštaj"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -100,20 +83,6 @@ msgstr "base.report.rml.save"
 msgid "Report Designer"
 msgstr "Dizajner Izvještaja"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-"Ovo je sablon vaseg zahtevanog izvestaja.\n"
-"Sacuvajte ga kao .SXW fajl i otvorite ga sa OpenOfice.\n"
-"Ne zaboravite da instalirate OpenERP SA paket OpenOffice da bi ga mogli "
-"modofikovati.\n"
-"Jednom izmenjen, ponovo ga uvezite u OpenERP koristeci ovog carobnjaka."
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -125,11 +94,6 @@ msgstr "Ime Fajla"
 msgid "Get a report"
 msgstr "Napravi Izvještaj"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Pošalji promenjen izveštaj na Server"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -175,6 +139,20 @@ msgstr "Instalacija i konfiguracione korake"
 msgid "Configuration Progress"
 msgstr "Napredak Konfiguracije"
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+"Ovo je sablon vaseg zahtevanog izvestaja.\n"
+"Sacuvajte ga kao .SXW fajl i otvorite ga sa OpenOfice.\n"
+"Ne zaboravite da instalirate OpenERP SA paket OpenOffice da bi ga mogli "
+"modofikovati.\n"
+"Jednom izmenjen, ponovo ga uvezite u OpenERP koristeci ovog carobnjaka."
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
@@ -268,3 +246,17 @@ msgstr "Odaberite izvještaj"
 
 #~ msgid "Operation"
 #~ msgstr "Postupak"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neispravan XML za pregled arhitekture!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neispravno ime modela u definiciji akcije."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
diff --git a/addons/base_report_designer/i18n/sr@latin.po b/addons/base_report_designer/i18n/sr@latin.po
index 49cc8026f40..73c42365354 100644
--- a/addons/base_report_designer/i18n/sr@latin.po
+++ b/addons/base_report_designer/i18n/sr@latin.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-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/sv.po b/addons/base_report_designer/i18n/sv.po
index df97edb55bd..d7f01867d3b 100644
--- a/addons/base_report_designer/i18n/sv.po
+++ b/addons/base_report_designer/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-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/tlh.po b/addons/base_report_designer/i18n/tlh.po
index 7eacfb2fb28..9de5d46774a 100644
--- a/addons/base_report_designer/i18n/tlh.po
+++ b/addons/base_report_designer/i18n/tlh.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,25 +21,14 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-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
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
 msgstr ""
 
 #. module: base_report_designer
@@ -47,11 +36,6 @@ msgstr ""
 msgid "The .SXW report"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -98,15 +82,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr ""
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -118,11 +93,6 @@ msgstr ""
 msgid "Get a report"
 msgstr ""
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -166,6 +136,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po
index 2861f730ab7..08b73c808ba 100644
--- a/addons/base_report_designer/i18n/tr.po
+++ b/addons/base_report_designer/i18n/tr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-09 07: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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,25 +21,14 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-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
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
 msgstr ""
 
 #. module: base_report_designer
@@ -47,11 +36,6 @@ msgstr ""
 msgid "The .SXW report"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -98,15 +82,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr "Rapor Tasarımcısı"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -118,11 +93,6 @@ msgstr ""
 msgid "Get a report"
 msgstr ""
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -166,6 +136,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/uk.po b/addons/base_report_designer/i18n/uk.po
index 04256f59860..acf12ea25d1 100644
--- a/addons/base_report_designer/i18n/uk.po
+++ b/addons/base_report_designer/i18n/uk.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-08 15:16+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,37 +21,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-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
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Завантажити змінений звіт"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr "Звіт .SXW"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -98,15 +82,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr "Дизайнер Звітів"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -118,11 +93,6 @@ msgstr ""
 msgid "Get a report"
 msgstr "Отримати Звіт"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Завантажити змінений звіт"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -166,6 +136,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/vi.po b/addons/base_report_designer/i18n/vi.po
index ae6716f609e..6dadf0982f3 100644
--- a/addons/base_report_designer/i18n/vi.po
+++ b/addons/base_report_designer/i18n/vi.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -22,25 +22,14 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-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
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
 msgstr ""
 
 #. module: base_report_designer
@@ -48,11 +37,6 @@ msgstr ""
 msgid "The .SXW report"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -99,15 +83,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr ""
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -119,11 +94,6 @@ msgstr ""
 msgid "Get a report"
 msgstr ""
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -167,6 +137,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/zh_CN.po b/addons/base_report_designer/i18n/zh_CN.po
index 424d33c9c5b..aac5df44d1e 100644
--- a/addons/base_report_designer/i18n/zh_CN.po
+++ b/addons/base_report_designer/i18n/zh_CN.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 03:47+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,37 +21,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-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
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "上传这修改的报表"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr "这.SXW报表"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -98,15 +82,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr "报表设计者"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -118,11 +93,6 @@ msgstr ""
 msgid "Get a report"
 msgstr "给一个报表"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "上传这修改的报表"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -166,6 +136,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
diff --git a/addons/base_report_designer/i18n/zh_TW.po b/addons/base_report_designer/i18n/zh_TW.po
index 3183bbe5a23..d78b4b87a56 100644
--- a/addons/base_report_designer/i18n/zh_TW.po
+++ b/addons/base_report_designer/i18n/zh_TW.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-01-30 12:44+0000\n"
 "Last-Translator: <>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -21,25 +21,14 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-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
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
 msgstr ""
 
 #. module: base_report_designer
@@ -47,11 +36,6 @@ msgstr ""
 msgid "The .SXW report"
 msgstr ""
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
@@ -98,15 +82,6 @@ msgstr ""
 msgid "Report Designer"
 msgstr ""
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid ""
-"This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
-"Once it is modified, re-upload it in OpenERP using this wizard."
-msgstr ""
-
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
@@ -118,11 +93,6 @@ msgstr ""
 msgid "Get a report"
 msgstr ""
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
@@ -166,6 +136,15 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
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 c0a2e5446ee..91f6ab4e7dd 100644
--- a/addons/base_setup/i18n/el.po
+++ b/addons/base_setup/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-13 13:34+0000\n"
-"Last-Translator: Dimitrios Ntoulas <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 03:01+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-14 05:06+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 8084db5fc8f..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-11 23:38+0000\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-14 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -57,11 +57,13 @@ msgid ""
 "Helps you manage your manufacturing processes and generate reports on those "
 "processes."
 msgstr ""
+"Ajuda-o a gerir os seus processos de produção e gera relatórios relativos "
+"aos mesmos."
 
 #. module: base_setup
 #: help:base.setup.installer,marketing:0
 msgid "Helps you manage your marketing campaigns step by step."
-msgstr ""
+msgstr "Ajuda-o a gerir as suas campanhas de marketing, passo a passo"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -89,7 +91,7 @@ msgstr ""
 #: code:addons/base_setup/__init__.py:0
 #, python-format
 msgid "The following users have been installed : \n"
-msgstr ""
+msgstr "Foram instalados os seguintes utilizadores: \n"
 
 #. module: base_setup
 #: field:base.setup.company,progress:0
@@ -111,7 +113,7 @@ msgstr "Moeda"
 #. module: base_setup
 #: field:base.setup.company,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Distrito"
 
 #. module: base_setup
 #: field:base.setup.installer,marketing:0
@@ -141,11 +143,13 @@ msgid ""
 "You can start configuring the system or connect directly to the database as "
 "an administrator."
 msgstr ""
+"Pode começar a configurar o sistema ou ligar-se diretamente à base de dados, "
+"como administrador"
 
 #. module: base_setup
 #: field:base.setup.installer,report_designer:0
 msgid "Advanced Reporting"
-msgstr ""
+msgstr "Relatórios avançados"
 
 #. module: base_setup
 #: field:base.setup.company,phone:0
@@ -180,6 +184,8 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Ajuda-o a gerir os seus projetos e tarefas, registando-os, gerando "
+"planeamentos, etc..."
 
 #. module: base_setup
 #: help:base.setup.installer,point_of_sale:0
@@ -253,7 +259,7 @@ msgstr "Configurar"
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Contabilidade e Finanças"
 
 #. module: base_setup
 #: field:base.setup.installer,auction:0
@@ -276,6 +282,8 @@ msgid ""
 "Lets you install addons geared towards sharing knowledge with and between "
 "your employees."
 msgstr ""
+"Permite-lhe instalar extras com o objetivo de partilhar informações com e "
+"entre os seus empregados."
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po
index 3e5ba6544f5..5ab549d5504 100644
--- a/addons/base_setup/i18n/sv.po
+++ b/addons/base_setup/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-12 21:10+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2010-12-14 23: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-14 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+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 4ff153497b1..f84309012cd 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)
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 5b8e9cdb8e5..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-11-24 09:23+0000\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-14 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
@@ -28,12 +28,12 @@ msgstr ""
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
 msgid "Base VAT - To check VAT number validity"
-msgstr ""
+msgstr "Bas moms - för att kontrollera momsregistreringsnumret"
 
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fel! Du kan inte skapa rekursivt kopplade medlemmar."
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:0
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/ar.po b/addons/board/i18n/ar.po
index 03d0263c442..48ecb7df4a3 100644
--- a/addons/board/i18n/ar.po
+++ b/addons/board/i18n/ar.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/bg.po b/addons/board/i18n/bg.po
index 992c03ce4be..54ddedb7256 100644
--- a/addons/board/i18n/bg.po
+++ b/addons/board/i18n/bg.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
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/br.po b/addons/board/i18n/br.po
index 7b14f888f36..a939d185d30 100644
--- a/addons/board/i18n/br.po
+++ b/addons/board/i18n/br.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/bs.po b/addons/board/i18n/bs.po
index e8046769725..6e32c5d1ae2 100644
--- a/addons/board/i18n/bs.po
+++ b/addons/board/i18n/bs.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/ca.po b/addons/board/i18n/ca.po
index 25b6ab51dfd..0b96f38022c 100644
--- a/addons/board/i18n/ca.po
+++ b/addons/board/i18n/ca.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/cs.po b/addons/board/i18n/cs.po
index 7d71d1d2669..4cf9d079bf8 100644
--- a/addons/board/i18n/cs.po
+++ b/addons/board/i18n/cs.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/de.po b/addons/board/i18n/de.po
index a9b3c7a23f8..588ed11bd39 100644
--- a/addons/board/i18n/de.po
+++ b/addons/board/i18n/de.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/el.po b/addons/board/i18n/el.po
index fa55a05d986..2f57d2026f6 100644
--- a/addons/board/i18n/el.po
+++ b/addons/board/i18n/el.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/board/i18n/es.po b/addons/board/i18n/es.po
index d0c88a43ead..5f82119fb01 100644
--- a/addons/board/i18n/es.po
+++ b/addons/board/i18n/es.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/es_AR.po b/addons/board/i18n/es_AR.po
index 1f2896c524a..f384736de71 100644
--- a/addons/board/i18n/es_AR.po
+++ b/addons/board/i18n/es_AR.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/es_EC.po b/addons/board/i18n/es_EC.po
index 884a40a41a5..4c9322a9d35 100644
--- a/addons/board/i18n/es_EC.po
+++ b/addons/board/i18n/es_EC.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/et.po b/addons/board/i18n/et.po
index 4acdc566907..6de2c9d2b55 100644
--- a/addons/board/i18n/et.po
+++ b/addons/board/i18n/et.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/fi.po b/addons/board/i18n/fi.po
index dcb0eb8aa1d..8ac04fedf4a 100644
--- a/addons/board/i18n/fi.po
+++ b/addons/board/i18n/fi.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/fr.po b/addons/board/i18n/fr.po
index 714417e6142..56d8e873ac9 100644
--- a/addons/board/i18n/fr.po
+++ b/addons/board/i18n/fr.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/gl.po b/addons/board/i18n/gl.po
index b140b32fa34..a49e1a79a19 100644
--- a/addons/board/i18n/gl.po
+++ b/addons/board/i18n/gl.po
@@ -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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/hr.po b/addons/board/i18n/hr.po
index 0c9c7c0fd05..adac15c09f3 100644
--- a/addons/board/i18n/hr.po
+++ b/addons/board/i18n/hr.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/hu.po b/addons/board/i18n/hu.po
index 03d0263c442..48ecb7df4a3 100644
--- a/addons/board/i18n/hu.po
+++ b/addons/board/i18n/hu.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/id.po b/addons/board/i18n/id.po
index 9df31955c26..0d42f800f6c 100644
--- a/addons/board/i18n/id.po
+++ b/addons/board/i18n/id.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/it.po b/addons/board/i18n/it.po
index bc4282621d1..eec259e7d69 100644
--- a/addons/board/i18n/it.po
+++ b/addons/board/i18n/it.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/ko.po b/addons/board/i18n/ko.po
index dcbe369094f..e341b68b056 100644
--- a/addons/board/i18n/ko.po
+++ b/addons/board/i18n/ko.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/lt.po b/addons/board/i18n/lt.po
index 6d9faa25295..0b7115a20c7 100644
--- a/addons/board/i18n/lt.po
+++ b/addons/board/i18n/lt.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/mn.po b/addons/board/i18n/mn.po
index 1b50406c9b8..9c59c48befd 100644
--- a/addons/board/i18n/mn.po
+++ b/addons/board/i18n/mn.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/nl.po b/addons/board/i18n/nl.po
index 522be6fbfb8..fdf803c01c6 100644
--- a/addons/board/i18n/nl.po
+++ b/addons/board/i18n/nl.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/nl_BE.po b/addons/board/i18n/nl_BE.po
index c59bdb68140..fb34244659a 100644
--- a/addons/board/i18n/nl_BE.po
+++ b/addons/board/i18n/nl_BE.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/pl.po b/addons/board/i18n/pl.po
index f2a2ad03454..35231a02b26 100644
--- a/addons/board/i18n/pl.po
+++ b/addons/board/i18n/pl.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/pt.po b/addons/board/i18n/pt.po
index e6cfd488244..1bedd2d5b1a 100644
--- a/addons/board/i18n/pt.po
+++ b/addons/board/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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/pt_BR.po b/addons/board/i18n/pt_BR.po
index 3f5f4a8cf06..19f856c707e 100644
--- a/addons/board/i18n/pt_BR.po
+++ b/addons/board/i18n/pt_BR.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/ro.po b/addons/board/i18n/ro.po
index 223d250b065..2dc6b233678 100644
--- a/addons/board/i18n/ro.po
+++ b/addons/board/i18n/ro.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/ru.po b/addons/board/i18n/ru.po
index 7a9c05ed730..9cf50ac5c55 100644
--- a/addons/board/i18n/ru.po
+++ b/addons/board/i18n/ru.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/sk.po b/addons/board/i18n/sk.po
index 01dab97fd4e..2f47b25ae46 100644
--- a/addons/board/i18n/sk.po
+++ b/addons/board/i18n/sk.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/sl.po b/addons/board/i18n/sl.po
index 6769aaeffd7..48cb29a235b 100644
--- a/addons/board/i18n/sl.po
+++ b/addons/board/i18n/sl.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/sq.po b/addons/board/i18n/sq.po
index b1fdabccd82..1ac84cf0485 100644
--- a/addons/board/i18n/sq.po
+++ b/addons/board/i18n/sq.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/sr.po b/addons/board/i18n/sr.po
index f865db6acb9..bff376ede5f 100644
--- a/addons/board/i18n/sr.po
+++ b/addons/board/i18n/sr.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/sr@latin.po b/addons/board/i18n/sr@latin.po
index c7d03653f1b..af0dfe26f44 100644
--- a/addons/board/i18n/sr@latin.po
+++ b/addons/board/i18n/sr@latin.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/sv.po b/addons/board/i18n/sv.po
index 4391909a9ac..d7d3aeb5e99 100644
--- a/addons/board/i18n/sv.po
+++ b/addons/board/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-12 19:14+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 01:56+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:26+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/tlh.po b/addons/board/i18n/tlh.po
index baa4d569bd1..4bf90a45731 100644
--- a/addons/board/i18n/tlh.po
+++ b/addons/board/i18n/tlh.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po
index 0cbcca79589..5065ebb97a5 100644
--- a/addons/board/i18n/tr.po
+++ b/addons/board/i18n/tr.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/uk.po b/addons/board/i18n/uk.po
index 9dbb7c95847..76c18414997 100644
--- a/addons/board/i18n/uk.po
+++ b/addons/board/i18n/uk.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+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 b275d8df9e6..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-14 05:26+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/i18n/zh_CN.po b/addons/board/i18n/zh_CN.po
index 3412c2cb867..52f45243a85 100644
--- a/addons/board/i18n/zh_CN.po
+++ b/addons/board/i18n/zh_CN.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/zh_TW.po b/addons/board/i18n/zh_TW.po
index 1d71a283e48..5def49afe63 100644
--- a/addons/board/i18n/zh_TW.po
+++ b/addons/board/i18n/zh_TW.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: 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/i18n/de.po b/addons/caldav/i18n/de.po
index 57d39396edf..9416a7dce15 100644
--- a/addons/caldav/i18n/de.po
+++ b/addons/caldav/i18n/de.po
@@ -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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
diff --git a/addons/caldav/i18n/el.po b/addons/caldav/i18n/el.po
index ed401fd7534..ee747add3d3 100644
--- a/addons/caldav/i18n/el.po
+++ b/addons/caldav/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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
diff --git a/addons/caldav/i18n/es.po b/addons/caldav/i18n/es.po
index 8d849aeb462..528c2150389 100644
--- a/addons/caldav/i18n/es.po
+++ b/addons/caldav/i18n/es.po
@@ -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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
diff --git a/addons/caldav/i18n/fr.po b/addons/caldav/i18n/fr.po
index e8a1e711ffb..0ec74003135 100644
--- a/addons/caldav/i18n/fr.po
+++ b/addons/caldav/i18n/fr.po
@@ -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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
diff --git a/addons/caldav/i18n/it.po b/addons/caldav/i18n/it.po
index 639dfcc791d..fb524ea90f0 100644
--- a/addons/caldav/i18n/it.po
+++ b/addons/caldav/i18n/it.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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
diff --git a/addons/caldav/i18n/nl.po b/addons/caldav/i18n/nl.po
index 260c1df136c..9c190669c86 100644
--- a/addons/caldav/i18n/nl.po
+++ b/addons/caldav/i18n/nl.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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
diff --git a/addons/caldav/i18n/pl.po b/addons/caldav/i18n/pl.po
index ac4def89072..c2f1265db6e 100644
--- a/addons/caldav/i18n/pl.po
+++ b/addons/caldav/i18n/pl.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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
diff --git a/addons/caldav/i18n/pt.po b/addons/caldav/i18n/pt.po
index e9d32d77cad..52dc60e7851 100644
--- a/addons/caldav/i18n/pt.po
+++ b/addons/caldav/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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
diff --git a/addons/caldav/i18n/sr.po b/addons/caldav/i18n/sr.po
index 1fe5f87fbe8..69a8c268368 100644
--- a/addons/caldav/i18n/sr.po
+++ b/addons/caldav/i18n/sr.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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
diff --git a/addons/caldav/i18n/sr@latin.po b/addons/caldav/i18n/sr@latin.po
index 1f870d0f22e..3fe0e0b1827 100644
--- a/addons/caldav/i18n/sr@latin.po
+++ b/addons/caldav/i18n/sr@latin.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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
diff --git a/addons/caldav/i18n/sv.po b/addons/caldav/i18n/sv.po
index 866577523e2..abc73354d32 100644
--- a/addons/caldav/i18n/sv.po
+++ b/addons/caldav/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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
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 b40f7131a47..8d6d1b5b9b5 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_meeting_data.xml b/addons/crm/crm_meeting_data.xml
index a7e4b400d76..86cdf97a2a3 100644
--- a/addons/crm/crm_meeting_data.xml
+++ b/addons/crm/crm_meeting_data.xml
@@ -23,7 +23,7 @@
         </record>
 
          <record model="res.request.link" id="request_link_meeting">
-            <field name="name">Case Meeting</field>
+            <field name="name">Meeting</field>
             <field name="object">crm.meeting</field>
         </record>
     </data>
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/ar.po b/addons/crm/i18n/ar.po
index 5b29682085c..ece88ea71a9 100644
--- a/addons/crm/i18n/ar.po
+++ b/addons/crm/i18n/ar.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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-10-30 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -113,11 +108,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -127,10 +117,14 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
 
 #. module: crm
@@ -150,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -262,6 +255,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -272,12 +274,6 @@ msgstr ""
 msgid "Criteria"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -319,6 +315,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -635,6 +638,11 @@ msgid ""
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -645,6 +653,13 @@ msgstr ""
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -778,7 +793,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -805,15 +819,17 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
 msgstr ""
 
 #. module: crm
@@ -848,13 +864,6 @@ msgstr ""
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1020,6 +1029,13 @@ msgstr ""
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1056,11 +1072,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
 
 #. module: crm
@@ -1068,11 +1082,6 @@ msgstr ""
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1089,6 +1098,12 @@ msgstr ""
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1109,6 +1124,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1209,11 +1236,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1222,11 +1251,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1299,20 +1323,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1406,13 +1438,14 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1420,6 +1453,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1531,11 +1569,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1567,6 +1600,16 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1577,14 +1620,18 @@ msgid "Name"
 msgstr ""
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1608,11 +1655,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1634,6 +1676,11 @@ msgstr ""
 msgid "High"
 msgstr ""
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1811,6 +1858,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1832,10 +1888,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1943,9 +1997,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1955,8 +2008,10 @@ msgid "Error !"
 msgstr ""
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2107,6 +2162,11 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2139,6 +2199,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2159,6 +2228,16 @@ msgstr ""
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2194,6 +2273,12 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2237,6 +2322,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2278,6 +2389,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2331,12 +2450,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2446,10 +2559,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2500,8 +2611,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2667,14 +2778,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2712,6 +2831,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2734,6 +2860,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2773,6 +2908,11 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2795,11 +2935,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2875,6 +3010,14 @@ msgstr ""
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3126,6 +3269,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3223,12 +3371,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3249,7 +3391,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3294,8 +3435,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3316,6 +3457,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3528,12 +3674,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
diff --git a/addons/crm/i18n/bg.po b/addons/crm/i18n/bg.po
index bc51e09da46..933bcfe803a 100644
--- a/addons/crm/i18n/bg.po
+++ b/addons/crm/i18n/bg.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 04:16+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@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-10-30 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -113,11 +108,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -127,10 +117,14 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
 
 #. module: crm
@@ -150,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -262,6 +255,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -272,12 +274,6 @@ msgstr ""
 msgid "Criteria"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -319,6 +315,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -635,6 +638,11 @@ msgid ""
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -645,6 +653,13 @@ msgstr ""
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -778,7 +793,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -805,15 +819,17 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
 msgstr ""
 
 #. module: crm
@@ -848,13 +864,6 @@ msgstr ""
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1020,6 +1029,13 @@ msgstr ""
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1056,11 +1072,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
 
 #. module: crm
@@ -1068,11 +1082,6 @@ msgstr ""
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1089,6 +1098,12 @@ msgstr ""
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1109,6 +1124,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1209,11 +1236,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1222,11 +1251,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1299,20 +1323,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1406,13 +1438,14 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1420,6 +1453,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1531,11 +1569,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1567,6 +1600,16 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1577,14 +1620,18 @@ msgid "Name"
 msgstr ""
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1608,11 +1655,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1634,6 +1676,11 @@ msgstr ""
 msgid "High"
 msgstr ""
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1811,6 +1858,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1832,10 +1888,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1943,9 +1997,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1955,8 +2008,10 @@ msgid "Error !"
 msgstr ""
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2107,6 +2162,11 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2139,6 +2199,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2159,6 +2228,16 @@ msgstr ""
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2194,6 +2273,12 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2237,6 +2322,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2278,6 +2389,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2331,14 +2450,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-"символи!"
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2448,10 +2559,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2502,8 +2611,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2669,14 +2778,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2714,6 +2831,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2736,6 +2860,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2775,6 +2908,11 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2797,11 +2935,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2877,6 +3010,14 @@ msgstr ""
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3128,6 +3269,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3225,12 +3371,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3251,7 +3391,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3296,8 +3435,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3318,6 +3457,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3530,12 +3674,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
@@ -3590,5 +3728,14 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Невалиден XML за преглед на архитектурата"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
+#~ "символи!"
+
 #~ msgid "    7 Days    "
 #~ msgstr "    7 Дни    "
diff --git a/addons/crm/i18n/bs.po b/addons/crm/i18n/bs.po
index 54469eba467..935f7407ab1 100644
--- a/addons/crm/i18n/bs.po
+++ b/addons/crm/i18n/bs.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 09:18+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-10-30 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -113,11 +108,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -127,10 +117,14 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
 
 #. module: crm
@@ -150,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -262,6 +255,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -272,12 +274,6 @@ msgstr ""
 msgid "Criteria"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -319,6 +315,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -635,6 +638,11 @@ msgid ""
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -645,6 +653,13 @@ msgstr ""
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -778,7 +793,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -805,15 +819,17 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
 msgstr ""
 
 #. module: crm
@@ -848,13 +864,6 @@ msgstr ""
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1020,6 +1029,13 @@ msgstr ""
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1056,11 +1072,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
 
 #. module: crm
@@ -1068,11 +1082,6 @@ msgstr ""
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1089,6 +1098,12 @@ msgstr ""
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1109,6 +1124,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1209,11 +1236,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1222,11 +1251,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1299,20 +1323,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1406,13 +1438,14 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1420,6 +1453,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1531,11 +1569,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1567,6 +1600,16 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1577,14 +1620,18 @@ msgid "Name"
 msgstr ""
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1608,11 +1655,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1634,6 +1676,11 @@ msgstr ""
 msgid "High"
 msgstr ""
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1811,6 +1858,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1832,10 +1888,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1943,9 +1997,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1955,8 +2008,10 @@ msgid "Error !"
 msgstr ""
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2107,6 +2162,11 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2139,6 +2199,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2159,6 +2228,16 @@ msgstr ""
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2194,6 +2273,12 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2237,6 +2322,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2278,6 +2389,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2331,12 +2450,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2446,10 +2559,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2500,8 +2611,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2667,14 +2778,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2712,6 +2831,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2734,6 +2860,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2773,6 +2908,11 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2795,11 +2935,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2875,6 +3010,14 @@ msgstr ""
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3126,6 +3269,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3223,12 +3371,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3249,7 +3391,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3294,8 +3435,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3316,6 +3457,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3528,12 +3674,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
@@ -3587,3 +3727,6 @@ msgstr ""
 #: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
diff --git a/addons/crm/i18n/ca.po b/addons/crm/i18n/ca.po
index e94eb612f58..5ac6a3ed175 100644
--- a/addons/crm/i18n/ca.po
+++ b/addons/crm/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 07:50+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -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-10-31 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -54,11 +54,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de model no vàlid en la definició de l'acció."
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -114,11 +109,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr "Casos"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -128,13 +118,15 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
-"La categoria d'empreses que serà afegida a les empreses que compleixin els "
-"criteris de segmentació després del càlcul."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -153,7 +145,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -265,6 +256,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -275,12 +275,6 @@ msgstr ""
 msgid "Criteria"
 msgstr "Criteris"
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -322,6 +316,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -641,6 +642,11 @@ msgstr ""
 "'Interval màx.'. Aquest és el grau de satisfacció inicial per defecte si la "
 "empresa no té cap esdeveniment."
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -651,6 +657,15 @@ msgstr "Opcions de perfils"
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+"La categoria d'empreses que serà afegida a les empreses que compleixin els "
+"criteris de segmentació després del càlcul."
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -784,7 +799,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -811,16 +825,18 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
+msgstr "Dies per període"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -854,13 +870,6 @@ msgstr "Exclusiu"
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1026,6 +1035,13 @@ msgstr "<"
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1062,23 +1078,16 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
-msgstr "Següent acció"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
+msgstr ""
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1095,6 +1104,12 @@ msgstr "Data límit"
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1115,6 +1130,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1215,11 +1242,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1228,11 +1257,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1305,20 +1329,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
-msgstr "Dies per període"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
+msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1415,13 +1447,14 @@ msgstr "Data"
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1429,6 +1462,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1540,11 +1578,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1576,6 +1609,16 @@ msgstr "="
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1586,14 +1629,18 @@ msgid "Name"
 msgstr "Nom"
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1617,11 +1664,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1643,6 +1685,11 @@ msgstr ""
 msgid "High"
 msgstr "Alta"
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1820,6 +1867,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1841,10 +1897,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1952,9 +2006,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1964,8 +2017,10 @@ msgid "Error !"
 msgstr "Error!"
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2116,6 +2171,11 @@ msgstr ""
 msgid "Note"
 msgstr "Nota"
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2148,6 +2208,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2168,6 +2237,16 @@ msgstr "Pendent"
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2203,6 +2282,12 @@ msgstr ""
 msgid "Active"
 msgstr "Actiu"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2246,6 +2331,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2287,6 +2398,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2340,14 +2459,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-"especial!"
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2459,10 +2570,8 @@ msgstr ""
 "interval, els X períodes anteriors."
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2513,8 +2622,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2680,14 +2789,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2725,6 +2842,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2747,6 +2871,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2788,6 +2921,11 @@ msgstr ""
 msgid "Operator"
 msgstr "Operador"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2810,11 +2948,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2890,6 +3023,14 @@ msgstr "Canal"
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr "Següent acció"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3141,6 +3282,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3238,12 +3384,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3264,7 +3404,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr "No s'ha trobat Email en l'adreça de la seva companyia!"
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3309,8 +3448,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3331,6 +3470,11 @@ msgstr "Contacte empresa"
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3543,12 +3687,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
@@ -3659,6 +3797,9 @@ msgstr ""
 #~ msgid "My "
 #~ msgstr "Meus "
 
+#~ msgid "Cases"
+#~ msgstr "Casos"
+
 #~ msgid "Watchers Emails"
 #~ msgstr "Observadors emails (CC)"
 
@@ -3772,6 +3913,9 @@ msgstr ""
 #~ msgid "Mail to these emails"
 #~ msgstr "Enviar correu a aquests emails"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invàlid per a la definició de la vista!"
+
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Paraules clau especials per a ser utilitzades en el missatge"
 
@@ -3994,6 +4138,12 @@ msgstr ""
 #~ msgid "Section Code"
 #~ msgstr "Codi de secció"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+#~ "especial!"
+
 #~ msgid "General Description"
 #~ msgstr "Descripció general"
 
@@ -4172,6 +4322,9 @@ msgstr ""
 #~ msgid "this wizard will create all sub-menus, within the selected menu."
 #~ msgstr "aquest assistent crearà tots els sub-menús, en el menú seleccionat."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom de model no vàlid en la definició de l'acció."
+
 #~ msgid ""
 #~ "You may want to create a new parent menu to put all the created menus in."
 #~ msgstr ""
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/cs.po b/addons/crm/i18n/cs.po
index 7f1fe6c6b7a..d9a7e529d38 100644
--- a/addons/crm/i18n/cs.po
+++ b/addons/crm/i18n/cs.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-27 13:29+0000\n"
 "Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\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-10-30 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Špatný název modelu v definici akce"
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -113,11 +108,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -127,10 +117,14 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
 
 #. module: crm
@@ -150,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -262,6 +255,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -272,12 +274,6 @@ msgstr ""
 msgid "Criteria"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -319,6 +315,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -635,6 +638,11 @@ msgid ""
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -645,6 +653,13 @@ msgstr ""
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -778,7 +793,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -805,15 +819,17 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
 msgstr ""
 
 #. module: crm
@@ -848,13 +864,6 @@ msgstr ""
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1020,6 +1029,13 @@ msgstr "<"
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1056,11 +1072,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
 
 #. module: crm
@@ -1068,11 +1082,6 @@ msgstr ""
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1089,6 +1098,12 @@ msgstr ""
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1109,6 +1124,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1209,11 +1236,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1222,11 +1251,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1299,20 +1323,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1406,13 +1438,14 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1420,6 +1453,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1531,11 +1569,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1567,6 +1600,16 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1577,14 +1620,18 @@ msgid "Name"
 msgstr ""
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1608,11 +1655,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1634,6 +1676,11 @@ msgstr ""
 msgid "High"
 msgstr ""
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1811,6 +1858,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1832,10 +1888,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1943,9 +1997,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1955,8 +2008,10 @@ msgid "Error !"
 msgstr ""
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2107,6 +2162,11 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2139,6 +2199,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2159,6 +2228,16 @@ msgstr ""
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2194,6 +2273,12 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2237,6 +2322,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2278,6 +2389,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2331,12 +2450,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2446,10 +2559,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2500,8 +2611,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2667,14 +2778,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2712,6 +2831,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2734,6 +2860,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2773,6 +2908,11 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2795,11 +2935,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2875,6 +3010,14 @@ msgstr ""
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3126,6 +3269,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3223,12 +3371,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3249,7 +3391,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3294,8 +3435,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3316,6 +3457,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3528,12 +3674,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
@@ -3588,5 +3728,8 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Špatný název modelu v definici akce"
+
 #~ msgid "CRM & SRM"
 #~ msgstr "CRM & SRM"
diff --git a/addons/crm/i18n/de.po b/addons/crm/i18n/de.po
index f24858988d7..6af9554e850 100644
--- a/addons/crm/i18n/de.po
+++ b/addons/crm/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 20:13+0000\n"
+"PO-Revision-Date: 2010-12-14 23:10+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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/el.po b/addons/crm/i18n/el.po
index 748882e4631..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-13 14:56+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-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"
@@ -585,7 +585,7 @@ msgstr "Πωλήσεις Συχνές Ερωτήσεις"
 #. 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
@@ -3681,33 +3681,33 @@ msgstr "Ώρες Εργασίας"
 #: view:crm.lead:0
 #: field:crm.lead,is_customer_add:0
 msgid "Customer"
-msgstr ""
+msgstr "Πελάτης"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Φεβρουάριος"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
 msgid "Schedule a Meeting"
-msgstr ""
+msgstr "Προγραμματισμός Σύσκεψης"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
 #: view:crm.lead:0
 msgid "Lost"
-msgstr ""
+msgstr "Χαμένος"
 
 #. module: crm
 #: field:crm.lead,country_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Χώρα"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3720,7 +3720,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Τετάρτη"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3732,12 +3732,12 @@ msgstr ""
 #. module: crm
 #: field:crm.case.resource.type,name:0
 msgid "Campaign Name"
-msgstr ""
+msgstr "Όνομα Εκστρατείας"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
 msgid "Phone calls by user and section"
-msgstr ""
+msgstr "Τηλεφωνήματα ανά χρήστη και τομέα"
 
 #. module: crm
 #: selection:crm.lead2opportunity.action,name:0
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index e2b51996769..519a229fae8 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.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-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/es_AR.po b/addons/crm/i18n/es_AR.po
index adc650faebc..ee0a6487d38 100644
--- a/addons/crm/i18n/es_AR.po
+++ b/addons/crm/i18n/es_AR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-15 15:45+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.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-10-30 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -113,11 +108,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr "Casos"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -127,13 +117,15 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
-"La categoría del partner que será añadida a las empresas que cumplan los "
-"criterios de segmentación después del cálculo."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -152,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -264,6 +255,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -274,12 +274,6 @@ msgstr ""
 msgid "Criteria"
 msgstr "Criterios"
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -321,6 +315,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -640,6 +641,11 @@ msgstr ""
 "'Intervalo máx.'. Este es estado de ánimo inicial predeterminado si el "
 "partner no tiene ningún evento."
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -650,6 +656,15 @@ msgstr "Opciones de perfiles"
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+"La categoría del partner que será añadida a las empresas que cumplan los "
+"criterios de segmentación después del cálculo."
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -783,7 +798,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -810,16 +824,18 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
+msgstr "Días por período"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -853,13 +869,6 @@ msgstr "Exclusivo"
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1025,6 +1034,13 @@ msgstr "<"
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1061,23 +1077,16 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
-msgstr "Próxima acción"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
+msgstr ""
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1094,6 +1103,12 @@ msgstr "Fecha límite"
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1114,6 +1129,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1214,11 +1241,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1227,11 +1256,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista!"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1304,20 +1328,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
-msgstr "Días por período"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
+msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1413,13 +1445,14 @@ msgstr "Fecha"
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1427,6 +1460,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1538,11 +1576,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1574,6 +1607,16 @@ msgstr "="
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1584,14 +1627,18 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1615,11 +1662,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1641,6 +1683,11 @@ msgstr ""
 msgid "High"
 msgstr "Alta"
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1818,6 +1865,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1839,10 +1895,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1950,9 +2004,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1962,8 +2015,10 @@ msgid "Error !"
 msgstr "Error !"
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2114,6 +2169,11 @@ msgstr ""
 msgid "Note"
 msgstr "Nota"
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2146,6 +2206,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2166,6 +2235,16 @@ msgstr "Pendiente"
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2201,6 +2280,12 @@ msgstr ""
 msgid "Active"
 msgstr "Activo"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2244,6 +2329,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2285,6 +2396,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2338,14 +2457,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
-"especial!"
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2457,10 +2568,8 @@ msgstr ""
 "intervalo, los X períodos anteriores."
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2511,8 +2620,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2678,14 +2787,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2723,6 +2840,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2745,6 +2869,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2784,6 +2917,11 @@ msgstr ""
 msgid "Operator"
 msgstr "Operador"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2806,11 +2944,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2886,6 +3019,14 @@ msgstr "Canal"
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr "Próxima acción"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3137,6 +3278,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3234,12 +3380,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3260,7 +3400,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3305,8 +3444,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3327,6 +3466,11 @@ msgstr "Contacto del Partner"
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3539,12 +3683,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
@@ -3638,6 +3776,9 @@ msgstr ""
 #~ msgid "Add watchers (Cc)"
 #~ msgstr "Añadir observadores (CC)"
 
+#~ msgid "Cases"
+#~ msgstr "Casos"
+
 #~ msgid "My "
 #~ msgstr "Mis "
 
@@ -3683,6 +3824,9 @@ msgstr ""
 #~ msgid "Category of case"
 #~ msgstr "Categoría del caso"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para la definición de la vista!"
+
 #~ msgid "%(case_subject)s = Case subject"
 #~ msgstr "%(case_subject)s = Asunto del caso"
 
@@ -4124,5 +4268,11 @@ msgstr ""
 #~ msgid "Estimates"
 #~ msgstr "Estimados"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
+#~ "especial!"
+
 #~ msgid "Send Partner & Historize"
 #~ msgstr "Enviar partner & Añadir historial"
diff --git a/addons/crm/i18n/et.po b/addons/crm/i18n/et.po
index 1b7ec3d792c..c4c0a99c4e8 100644
--- a/addons/crm/i18n/et.po
+++ b/addons/crm/i18n/et.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 04:21+0000\n"
 "Last-Translator: lyyser <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-10-30 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr "Juhtumi staatus"
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -113,11 +108,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr "Juhtumid"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -127,13 +117,15 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
-"Partneri kategooria mis lisatakse partneritele, kes vastavad segmenteerimise "
-"kriteeriumitele pärast arvutamist."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -152,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -264,6 +255,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -274,12 +274,6 @@ msgstr "Saada uus e-kiri"
 msgid "Criteria"
 msgstr "Kriteerium"
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -321,6 +315,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -639,6 +640,11 @@ msgstr ""
 "Vaikimisi meeleolu 'Maks. intervall' arvutamise eelnevale perioodile. See on "
 "vaikimisi algusmeeleolu, kui partneril puuduvad sündmused."
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -649,6 +655,15 @@ msgstr "Profileerimise omadused"
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+"Partneri kategooria mis lisatakse partneritele, kes vastavad segmenteerimise "
+"kriteeriumitele pärast arvutamist."
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -782,7 +797,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -809,16 +823,18 @@ msgid "Search Phonecalls"
 msgstr "Otsi telefonikõnesi"
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Jätka"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
+msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
+msgstr "Päevi Perioodis"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -852,13 +868,6 @@ msgstr "Eksklusiivne"
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1024,6 +1033,13 @@ msgstr "<"
 msgid "Mobile"
 msgstr "Mobiil"
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1060,23 +1076,16 @@ msgid "Meetings"
 msgstr "Koosolekud"
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
-msgstr "Järgmine Toiming"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
+msgstr ""
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1093,6 +1102,12 @@ msgstr "Tähtaeg"
 msgid "_Cancel"
 msgstr "_Katkesta"
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1113,6 +1128,18 @@ msgstr ""
 msgid "Attendees"
 msgstr "Osalejad"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1213,11 +1240,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr "Tase"
 
@@ -1226,11 +1255,6 @@ msgstr "Tase"
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1303,20 +1327,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr "Jätka"
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
-msgstr "Päevi Perioodis"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
+msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1412,20 +1444,26 @@ msgstr "Kuupäev"
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
-msgstr ""
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
+msgstr "Võimalus summaarselt"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1537,11 +1575,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1573,6 +1606,16 @@ msgstr "="
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1582,17 +1625,21 @@ msgstr ""
 msgid "Name"
 msgstr "Nimi"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,alarm_id:0
 #: field:crm.meeting,base_calendar_alarm_id:0
 msgid "Alarm"
 msgstr "Alarm"
 
-#. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1614,11 +1661,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1640,6 +1682,11 @@ msgstr ""
 msgid "High"
 msgstr "Kõrge"
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1817,6 +1864,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1838,10 +1894,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1949,9 +2003,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1961,8 +2014,10 @@ msgid "Error !"
 msgstr "Viga !"
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2113,6 +2168,11 @@ msgstr "Reseti kui kinnitamatta"
 msgid "Note"
 msgstr "Märkus"
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2145,6 +2205,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr "Sisemine kohtumine"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2165,6 +2234,16 @@ msgstr "Pooleliolev"
 msgid "Customer Meeting"
 msgstr "Kohtumine kliendiga"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2200,6 +2279,12 @@ msgstr "Telefon"
 msgid "Active"
 msgstr "Aktiivne"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2243,6 +2328,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2284,6 +2395,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2337,13 +2456,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: 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: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2455,10 +2567,8 @@ msgstr ""
 "jooksul, pärast X perioodi."
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2509,9 +2619,9 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
-msgstr "Võimalus summaarselt"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2676,14 +2786,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2721,6 +2839,13 @@ msgstr "Katkestatud"
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2743,6 +2868,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2782,6 +2916,11 @@ msgstr ""
 msgid "Operator"
 msgstr "Operaator"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2804,11 +2943,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2884,6 +3018,14 @@ msgstr "Allikas"
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr "Järgmine Toiming"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3135,6 +3277,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3232,12 +3379,6 @@ msgstr "Võibolla pead veenduma kas see partner juba ei eksisteri."
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3258,7 +3399,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3303,8 +3443,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3325,6 +3465,11 @@ msgstr "Partneri Kontakt"
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3537,12 +3682,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
@@ -3660,6 +3799,9 @@ msgstr "Infoleht"
 #~ msgid "My "
 #~ msgstr "Minu "
 
+#~ msgid "Cases"
+#~ msgstr "Juhtumid"
+
 #~ msgid "Create menu Entries"
 #~ msgstr "Loo menüü Kirjed"
 
@@ -3690,6 +3832,9 @@ msgstr "Infoleht"
 #~ msgid "Case State"
 #~ msgstr "Juhtumi Staatus"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Vigane XML vaate arhitektuurile!"
+
 #~ msgid "My Histories"
 #~ msgstr "Minu Ajalood"
 
@@ -3809,6 +3954,11 @@ msgstr "Infoleht"
 #~ msgid "Section Code"
 #~ msgstr "Jaotise Kood"
 
+#~ 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 "General Description"
 #~ msgstr "Üldine kirjeldus"
 
@@ -3871,6 +4021,9 @@ msgstr "Infoleht"
 #~ msgid "Cases by section"
 #~ msgstr "Juhtumid jaotisejärgi"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
+
 #~ msgid "Add Last Mail for Replying"
 #~ msgstr "Lisa viimane kiri vastamiseks"
 
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index cbc7ba1b9fa..f8be6f2be0c 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 09:11+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@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-31 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -54,11 +54,6 @@ msgstr "Tapahtuman vaihe"
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -114,11 +109,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr "Vaiheen nimi"
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr "Tapaukset"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -128,13 +118,15 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
-"Kumppanikategoria joka lisätään kumppaneille, jotka täsmäävät "
-"jaotteluominaisuuksiin laskennan jälkeen."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -153,7 +145,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -265,6 +256,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -275,12 +275,6 @@ msgstr "Lähetä uusi sähköposti"
 msgid "Criteria"
 msgstr "Kriteeri"
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -322,6 +316,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -640,6 +641,11 @@ msgstr ""
 "Oletusmielentila ajanjaksolle jossa lasketaan maksimi väliaika. Tämä on "
 "oletuksena aloitusmielentila jos kumppanilla ei ole tapahtumia."
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -650,6 +656,15 @@ msgstr "Profilointi valinnat"
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+"Kumppanikategoria joka lisätään kumppaneille, jotka täsmäävät "
+"jaotteluominaisuuksiin laskennan jälkeen."
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -783,7 +798,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -810,16 +824,18 @@ msgid "Search Phonecalls"
 msgstr "Etsi puhelut"
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "jatka"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
+msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
+msgstr "Päiviä jaksossa"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -853,13 +869,6 @@ msgstr "Poissulkeva"
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1025,6 +1034,13 @@ msgstr "<"
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1061,23 +1077,16 @@ msgid "Meetings"
 msgstr "Kokoukset"
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
-msgstr "Seuraava Toimenpide"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
+msgstr ""
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1094,6 +1103,12 @@ msgstr "Määräaika"
 msgid "_Cancel"
 msgstr "_Peruuta"
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1114,6 +1129,18 @@ msgstr ""
 msgid "Attendees"
 msgstr "Osallistujat"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1214,11 +1241,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr "Vaihe"
 
@@ -1227,11 +1256,6 @@ msgstr "Vaihe"
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1304,20 +1328,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr "jatka"
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
-msgstr "Päiviä jaksossa"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
+msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1413,20 +1445,26 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
-msgstr ""
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
+msgstr "Mahdollisuuksien yhteenveto"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1538,11 +1576,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1574,6 +1607,16 @@ msgstr "="
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1583,17 +1626,21 @@ msgstr ""
 msgid "Name"
 msgstr "Nimi"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,alarm_id:0
 #: field:crm.meeting,base_calendar_alarm_id:0
 msgid "Alarm"
 msgstr "Hälytys"
 
-#. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
-msgstr "Ajoita normaali puhelinkokous"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1615,11 +1662,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1641,6 +1683,11 @@ msgstr ""
 msgid "High"
 msgstr "Suuri"
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1818,6 +1865,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1839,10 +1895,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1950,10 +2004,9 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
-msgstr ""
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
+msgstr "Ajoita normaali puhelinkokous"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1962,8 +2015,10 @@ msgid "Error !"
 msgstr "Virhe!"
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2114,6 +2169,11 @@ msgstr "Palauta vahvistamattomaksi"
 msgid "Note"
 msgstr "Huomautus"
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2146,6 +2206,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr "Sisäinen kokous"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2166,6 +2235,16 @@ msgstr "Odottaa"
 msgid "Customer Meeting"
 msgstr "Asiakastapaaminen"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2201,6 +2280,12 @@ msgstr "Puhelin"
 msgid "Active"
 msgstr "Aktiivinen"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2244,6 +2329,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2285,6 +2396,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2338,12 +2457,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2455,10 +2568,8 @@ msgstr ""
 "aikavälillä. X ajanjaksoa."
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2509,9 +2620,9 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
-msgstr "Mahdollisuuksien yhteenveto"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2676,14 +2787,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2721,6 +2840,13 @@ msgstr "Peruutettu"
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2743,6 +2869,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2782,6 +2917,11 @@ msgstr ""
 msgid "Operator"
 msgstr "Operaattori"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2804,11 +2944,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2884,6 +3019,14 @@ msgstr "Kanava"
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr "Seuraava Toimenpide"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3135,6 +3278,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3232,12 +3380,6 @@ msgstr "Sinun täytyy varmistaa ettei tämä kumppani ole jo olemassa."
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3258,7 +3400,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3303,8 +3444,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3325,6 +3466,11 @@ msgstr "Kumppanin Yhteystiedot"
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3537,12 +3683,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
@@ -3959,6 +4099,9 @@ msgstr ""
 #~ msgid "Close job request"
 #~ msgstr "Sulje tehtäväpyyntö"
 
+#~ msgid "Cases"
+#~ msgstr "Tapaukset"
+
 #~ msgid "TRANSPARENT"
 #~ msgstr "LÄPINÄKYVÄ"
 
@@ -4068,9 +4211,16 @@ msgstr ""
 #~ msgid "Open Cases"
 #~ msgstr "Avoimet tapaukset"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
+
 #~ msgid "Conditions"
 #~ msgstr "Olosuhteet"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
+
 #~ msgid "Refused by Company"
 #~ msgstr "Hylätty yhtiön toimesta"
 
@@ -4217,6 +4367,9 @@ msgstr ""
 #~ msgid "Pending Claims"
 #~ msgstr "Odottavat vaateet"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
+
 #~ msgid "Closed Won"
 #~ msgstr "Suljettu voitettuna"
 
diff --git a/addons/crm/i18n/fr.po b/addons/crm/i18n/fr.po
index aa368413329..1f8175c9ba7 100644
--- a/addons/crm/i18n/fr.po
+++ b/addons/crm/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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-27 14: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-11-28 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr "Etape des cas"
 msgid "Visibility"
 msgstr "Visibilité"
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de l'objet invalide dans l'action défini"
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -149,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -290,11 +284,6 @@ msgstr "Réponses exclues :"
 msgid "Sections"
 msgstr "Sections"
 
-#. module: crm
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "_Merge"
@@ -545,11 +534,6 @@ msgstr "Créer une opportunité"
 msgid "August"
 msgstr "Août"
 
-#. module: crm
-#: field:crm.segmentation,sales_purchase_active:0
-msgid "Use The Sales Purchase Rules"
-msgstr "Utilise les Règles Ventes - Achats"
-
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: view:crm.lead:0
@@ -663,6 +647,11 @@ msgstr ""
 "maximale. C'est l'état d'esprit par défaut si le partenaire n'a pas "
 "d'évenement."
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -822,7 +811,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -1061,6 +1049,13 @@ msgstr "<"
 msgid "Mobile"
 msgstr "Téléphone mobile"
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1276,11 +1271,6 @@ msgstr "Étape"
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1485,6 +1475,11 @@ msgstr "Sommaire des affaires"
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1596,11 +1591,6 @@ msgstr "Catégories des appels téléphoniques"
 msgid "Invite People"
 msgstr "Personne à inviter"
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1687,11 +1677,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1925,10 +1910,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -2011,9 +1994,9 @@ msgid "Priority"
 msgstr "Priorité"
 
 #. module: crm
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
+#: field:crm.segmentation,sales_purchase_active:0
+msgid "Use The Sales Purchase Rules"
+msgstr "Utilise les Règles Ventes - Achats"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
@@ -2201,6 +2184,11 @@ msgstr "Réinitialiser à non-confirmé"
 msgid "Note"
 msgstr "Note"
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2411,11 +2399,6 @@ msgstr ""
 msgid "Weekly"
 msgstr "Semaine"
 
-#. module: crm
-#: sql_constraint:ir.ui.view_sc:0
-msgid "Shortcut for this menu already exists!"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
@@ -2449,11 +2432,6 @@ msgstr "Autre"
 msgid "Done"
 msgstr "Terminé"
 
-#. module: crm
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
 msgid "Max Interval"
@@ -2494,14 +2472,6 @@ msgstr ""
 msgid "Busy"
 msgstr "Occupé"
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
-"spéciaux !"
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2963,6 +2933,11 @@ msgstr "Résumé de l'appel"
 msgid "Operator"
 msgstr "Opérateur"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2985,11 +2960,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -3324,6 +3294,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3421,12 +3396,6 @@ msgstr "Vous devez vérifier que ce partenaire n'existe pas"
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3447,7 +3416,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr "Pas de courriel défini dans l'adresse de votre société"
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3492,8 +3460,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3514,6 +3482,11 @@ msgstr "Contact partenaire"
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3528,11 +3501,6 @@ msgstr ""
 msgid "Close"
 msgstr "Clôturer"
 
-#. module: crm
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
@@ -3917,6 +3885,9 @@ msgstr "Bulletin d'information"
 #~ msgid "Mail to these emails"
 #~ msgstr "Mail à ces adresses"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valide pour l'architecture de la vue"
+
 #~ msgid "My Histories"
 #~ msgstr "Mon historique"
 
@@ -4073,6 +4044,12 @@ msgstr "Bulletin d'information"
 #~ msgid "Section Code"
 #~ msgstr "Code de la section"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+#~ "spéciaux !"
+
 #~ msgid "General Description"
 #~ msgstr "Description générale"
 
@@ -4916,6 +4893,9 @@ msgstr "Bulletin d'information"
 #~ msgid "Expected Close Date"
 #~ msgstr "Date prévisionelle de clôture"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom de l'objet invalide dans l'action défini"
+
 #~ msgid "Case Resource Type"
 #~ msgstr "Type de ressouce pour le cas"
 
diff --git a/addons/crm/i18n/gl.po b/addons/crm/i18n/gl.po
index 5176ddafb6c..00f4f22ab2d 100644
--- a/addons/crm/i18n/gl.po
+++ b/addons/crm/i18n/gl.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: crm-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2009-08-17 08:29+0000\n"
-"Last-Translator: Frco. Javier Rial <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\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-10-30 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -55,11 +55,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -115,11 +110,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr "Casos"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -129,13 +119,15 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
-"A categoría de empresas que será engadida ás empresas que cumpran os "
-"criterios de segmentación despois do cálculo"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -154,7 +146,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -266,6 +257,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -276,12 +276,6 @@ msgstr ""
 msgid "Criteria"
 msgstr "Criterio"
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -323,6 +317,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -642,6 +643,11 @@ msgstr ""
 "intervalo máximo. Este é o grao de satisfacción inicial por defecto no caso "
 "de que a empresa non teña ningún evento"
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -652,6 +658,15 @@ msgstr "Opcións de perfís"
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+"A categoría de empresas que será engadida ás empresas que cumpran os "
+"criterios de segmentación despois do cálculo"
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -785,7 +800,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -812,16 +826,18 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
+msgstr "Días por período"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -855,13 +871,6 @@ msgstr "Exclusivo"
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1027,6 +1036,13 @@ msgstr "<"
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1063,23 +1079,16 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
-msgstr "Seguinte acción"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
+msgstr ""
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1096,6 +1105,12 @@ msgstr "Data límite"
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1116,6 +1131,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1216,11 +1243,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1229,11 +1258,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML non válido para a definición da vista!"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1306,20 +1330,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
-msgstr "Días por período"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
+msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1415,13 +1447,14 @@ msgstr "Data"
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1429,6 +1462,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1540,11 +1578,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1576,6 +1609,16 @@ msgstr "="
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1586,14 +1629,18 @@ msgid "Name"
 msgstr "Nome"
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1617,11 +1664,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1643,6 +1685,11 @@ msgstr ""
 msgid "High"
 msgstr "Alto"
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1820,6 +1867,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1841,10 +1897,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1952,9 +2006,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1964,8 +2017,10 @@ msgid "Error !"
 msgstr "Erro !"
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2116,6 +2171,11 @@ msgstr ""
 msgid "Note"
 msgstr "Nota"
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2148,6 +2208,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2168,6 +2237,16 @@ msgstr "Pendente"
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2203,6 +2282,12 @@ msgstr ""
 msgid "Active"
 msgstr "Activo"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2246,6 +2331,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2287,6 +2398,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2340,14 +2459,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡O nome do obxecto debe comezar con x_ y e non conter ningún carácter "
-"especial!"
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2459,10 +2570,8 @@ msgstr ""
 "os X períodos anteriores."
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2513,8 +2622,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2680,14 +2789,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2725,6 +2842,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2747,12 +2871,23 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
 "If the partner has not purchased (or bought) during a period, decrease the "
 "state of mind by this factor. It's a multiplication"
 msgstr ""
+"Se a empresa non adquiriu (ou comprou) durante un pedriodo, disminuirase o "
+"estado de ánimo por este factor. Isto é unha multiplicación"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -2786,6 +2921,11 @@ msgstr ""
 msgid "Operator"
 msgstr "Operador"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2808,11 +2948,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2888,6 +3023,14 @@ msgstr "Canle"
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr "Seguinte acción"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3139,6 +3282,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3236,12 +3384,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3259,10 +3401,9 @@ msgstr ""
 #: code:addons/crm/crm_action_rule.py:0
 #, python-format
 msgid "No E-Mail ID Found for your Company address!"
-msgstr ""
+msgstr "¡Non se atopou o email para a dirección da túa compañía!"
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3307,8 +3448,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3329,6 +3470,11 @@ msgstr "Contacto do partner"
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3541,12 +3687,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
@@ -3634,6 +3774,9 @@ msgstr ""
 #~ msgid "Template of Email to Send"
 #~ msgstr "Plantilla de correo electrónico para enviar"
 
+#~ msgid "Cases"
+#~ msgstr "Casos"
+
 #~ msgid "Add watchers (Cc)"
 #~ msgstr "Engadir destinatarios (CC)"
 
@@ -3969,6 +4112,9 @@ msgstr ""
 #~ msgid "Select Views (empty for default)"
 #~ msgstr "Seleccionar vistas (baleira por defecto)"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML non válido para a definición da vista!"
+
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Palabras chave especiais para ser empregadas no corpo da mensaxe"
 
@@ -4038,6 +4184,12 @@ msgstr ""
 #~ msgid "Section Code"
 #~ msgstr "Código de sección"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡O nome do obxecto debe comezar con x_ y e non conter ningún carácter "
+#~ "especial!"
+
 #~ msgid "Create Menus For Cases"
 #~ msgstr "Crear menús para unha sección de casos"
 
@@ -4128,19 +4280,6 @@ msgstr ""
 #~ msgid "Trigger Date"
 #~ msgstr "Data do disparo"
 
-#~ msgid ""
-#~ "A period is the average number of days between two cycle of sale or purchase "
-#~ "for this segmentation. It's mainly used to detect if a partner has not "
-#~ "purchased or buy for a too long time, so we suppose that his state of mind "
-#~ "has decreased because he probably bought goods to another supplier. Use this "
-#~ "functionality for recurring businesses."
-#~ msgstr ""
-#~ "Un período é o númer omedio de días entre dous ciclos de venda ou compra "
-#~ "para esta segmentación. Úsase principalmente para detectar se un partner non "
-#~ "comprou ou vendeu durante un período longo de tempo, polo que supoñemos que "
-#~ "perdeu algo de confianza con nós ou que estivo comprado a outro vendedor. "
-#~ "Use esta funcionalidade para negocios recorrentes."
-
 #, python-format
 #~ msgid ""
 #~ "Can not send mail with empty body,you should have description in the body"
diff --git a/addons/crm/i18n/hr.po b/addons/crm/i18n/hr.po
index 5e4333e4403..c82e2306132 100644
--- a/addons/crm/i18n/hr.po
+++ b/addons/crm/i18n/hr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-04 08:57+0000\n"
 "Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@gmail.com>\n"
 "Language-Team: Vinteh\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:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
@@ -54,11 +54,6 @@ msgstr "Stupanj Slučaja"
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nepravilno ime modela u definiciji radnje."
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -114,11 +109,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr "Naziv stupnja"
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr "Slučajevi"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -128,13 +118,15 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
-"Kategorija partnera koja će biti dodana partnerima koji se - po izračunu - "
-"podudaraju s kriterijima segmentacije."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -153,7 +145,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -265,6 +256,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -275,12 +275,6 @@ msgstr "Pošalji novi e-mail"
 msgid "Criteria"
 msgstr "Kriteriji"
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -322,6 +316,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -640,6 +641,11 @@ msgstr ""
 "Zadano zadovoljstvo za razdoblje koje prethodi izračunu 'Max. interval'. Ovo "
 "je početno zadovoljstvo partnera dok još nema događaja."
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -650,6 +656,15 @@ msgstr ""
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+"Kategorija partnera koja će biti dodana partnerima koji se - po izračunu - "
+"podudaraju s kriterijima segmentacije."
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -783,7 +798,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -810,16 +824,18 @@ msgid "Search Phonecalls"
 msgstr "Pretraži Telefonske pozive"
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Nastavi"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
+msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Ime Prilike"
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
+msgstr "Dani po Periodu"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -853,13 +869,6 @@ msgstr "Isključujući"
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1025,6 +1034,13 @@ msgstr "<"
 msgid "Mobile"
 msgstr "Mobitel"
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1061,23 +1077,16 @@ msgid "Meetings"
 msgstr "Sastanci"
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
-msgstr "Siljedeća Radnja"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
+msgstr ""
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1094,6 +1103,12 @@ msgstr "Rok"
 msgid "_Cancel"
 msgstr "_Odustani"
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1114,6 +1129,18 @@ msgstr ""
 msgid "Attendees"
 msgstr "Sudionici"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1214,11 +1241,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr "Stupanj"
 
@@ -1227,11 +1256,6 @@ msgstr "Stupanj"
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1304,20 +1328,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr "Nastavi"
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
-msgstr "Dani po Periodu"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
+msgstr "Ime Prilike"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1413,20 +1445,26 @@ msgstr "Datum"
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
-msgstr ""
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
+msgstr "Sažetak prilike"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1538,11 +1576,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1574,6 +1607,16 @@ msgstr "="
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1583,17 +1626,21 @@ msgstr ""
 msgid "Name"
 msgstr "Ime"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,alarm_id:0
 #: field:crm.meeting,base_calendar_alarm_id:0
 msgid "Alarm"
 msgstr "Alarm"
 
-#. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
-msgstr "Dogovorite uobičajen ili telefonski sastanak"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1615,11 +1662,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1641,6 +1683,11 @@ msgstr ""
 msgid "High"
 msgstr "Visok"
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1818,6 +1865,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1839,10 +1895,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1950,10 +2004,9 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
-msgstr ""
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
+msgstr "Dogovorite uobičajen ili telefonski sastanak"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1962,8 +2015,10 @@ msgid "Error !"
 msgstr "Greška !"
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2114,6 +2169,11 @@ msgstr "Vrati na Nepotvrđen"
 msgid "Note"
 msgstr "Bilješka"
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2146,6 +2206,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr "Interni sastanak"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2166,6 +2235,16 @@ msgstr "U tijeku"
 msgid "Customer Meeting"
 msgstr "sastanak sa Strankom"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2201,6 +2280,12 @@ msgstr "Telefon"
 msgid "Active"
 msgstr "Aktivan"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2244,6 +2329,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2285,6 +2396,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2338,13 +2457,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2461,10 +2573,8 @@ msgstr ""
 "intervala, zadnjih X razdoblja."
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2515,9 +2625,9 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
-msgstr "Sažetak prilike"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2682,14 +2792,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2727,6 +2845,13 @@ msgstr "Otkazan"
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2749,6 +2874,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2788,6 +2922,11 @@ msgstr "Sažetak poziva"
 msgid "Operator"
 msgstr "Operator"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2810,11 +2949,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2890,6 +3024,14 @@ msgstr "Kanal"
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr "Siljedeća Radnja"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3141,6 +3283,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3238,12 +3385,6 @@ msgstr "Trebate provjeriti postoji li već ovaj Partner!"
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3264,7 +3405,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr "Nema e-mail ID-a za adresu Vaše Tvrtke"
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3309,8 +3449,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3331,6 +3471,11 @@ msgstr "Osoba Partner"
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3543,12 +3688,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
@@ -3615,6 +3754,9 @@ msgstr "Newsletter"
 #~ msgid "Template of Email to Send"
 #~ msgstr "Predložak Emaila za slanje"
 
+#~ msgid "Cases"
+#~ msgstr "Slučajevi"
+
 #~ msgid "Case history"
 #~ msgstr "Povijest slučaja"
 
@@ -3872,6 +4014,14 @@ msgstr "Newsletter"
 #~ msgid "%(case_user_phone)s = Responsible phone"
 #~ msgstr "%(case_user_phone)s = Tel. broj odgovorne osobe"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nepravilno ime modela u definiciji radnje."
+
 #~ msgid "Open Cases"
 #~ msgstr "Otvoreni Slučajevi"
 
@@ -4159,6 +4309,9 @@ msgstr "Newsletter"
 #~ msgid "Open cases"
 #~ msgstr "Otvoreni Slučajevi"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalid XML for View Architecture!"
+
 #~ msgid ""
 #~ "If the active field is set to true, it will allow you to hide the case "
 #~ "section without removing it."
diff --git a/addons/crm/i18n/hu.po b/addons/crm/i18n/hu.po
index 910a722a334..88f81797428 100644
--- a/addons/crm/i18n/hu.po
+++ b/addons/crm/i18n/hu.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 10:10+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-10-30 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -113,11 +108,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -127,10 +117,14 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
 
 #. module: crm
@@ -150,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -262,6 +255,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -272,12 +274,6 @@ msgstr ""
 msgid "Criteria"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -319,6 +315,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -635,6 +638,11 @@ msgid ""
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -645,6 +653,13 @@ msgstr ""
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -778,7 +793,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -805,15 +819,17 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
 msgstr ""
 
 #. module: crm
@@ -848,13 +864,6 @@ msgstr ""
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1020,6 +1029,13 @@ msgstr ""
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1056,11 +1072,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
 
 #. module: crm
@@ -1068,11 +1082,6 @@ msgstr ""
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1089,6 +1098,12 @@ msgstr "Következő művelet dátuma"
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1109,6 +1124,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1209,11 +1236,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1222,11 +1251,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1299,20 +1323,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1406,13 +1438,14 @@ msgstr "Dátum"
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1420,6 +1453,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1531,11 +1569,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1567,6 +1600,16 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1577,14 +1620,18 @@ msgid "Name"
 msgstr ""
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1608,11 +1655,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1634,6 +1676,11 @@ msgstr ""
 msgid "High"
 msgstr ""
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1811,6 +1858,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1832,10 +1888,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1943,9 +1997,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1955,8 +2008,10 @@ msgid "Error !"
 msgstr ""
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2107,6 +2162,11 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2139,6 +2199,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2159,6 +2228,16 @@ msgstr ""
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2194,6 +2273,12 @@ msgstr ""
 msgid "Active"
 msgstr "Aktív"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2237,6 +2322,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2278,6 +2389,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2331,12 +2450,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2446,10 +2559,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2500,8 +2611,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2667,14 +2778,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2712,6 +2831,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2734,6 +2860,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2773,6 +2908,11 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2795,11 +2935,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2875,6 +3010,14 @@ msgstr "Csatorna"
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3126,6 +3269,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3223,12 +3371,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3249,7 +3391,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3294,8 +3435,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3316,6 +3457,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3528,12 +3674,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
diff --git a/addons/crm/i18n/id.po b/addons/crm/i18n/id.po
index c82c7fe14b5..2ae1392abcb 100644
--- a/addons/crm/i18n/id.po
+++ b/addons/crm/i18n/id.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-09 13:48+0000\n"
 "Last-Translator: <>\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-10-30 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -113,11 +108,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -127,10 +117,14 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
 
 #. module: crm
@@ -150,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -262,6 +255,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -272,12 +274,6 @@ msgstr ""
 msgid "Criteria"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -319,6 +315,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -635,6 +638,11 @@ msgid ""
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -645,6 +653,13 @@ msgstr ""
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -778,7 +793,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -805,15 +819,17 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
 msgstr ""
 
 #. module: crm
@@ -848,13 +864,6 @@ msgstr ""
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1020,6 +1029,13 @@ msgstr ""
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1056,11 +1072,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
 
 #. module: crm
@@ -1068,11 +1082,6 @@ msgstr ""
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1089,6 +1098,12 @@ msgstr ""
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1109,6 +1124,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1209,11 +1236,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1222,11 +1251,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1299,20 +1323,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1406,13 +1438,14 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1420,6 +1453,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1531,11 +1569,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1567,6 +1600,16 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1577,14 +1620,18 @@ msgid "Name"
 msgstr ""
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1608,11 +1655,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1634,6 +1676,11 @@ msgstr ""
 msgid "High"
 msgstr ""
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1811,6 +1858,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1832,10 +1888,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1943,9 +1997,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1955,8 +2008,10 @@ msgid "Error !"
 msgstr ""
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2107,6 +2162,11 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2139,6 +2199,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2159,6 +2228,16 @@ msgstr ""
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2194,6 +2273,12 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2237,6 +2322,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2278,6 +2389,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2331,12 +2450,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2446,10 +2559,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2500,8 +2611,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2667,14 +2778,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2712,6 +2831,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2734,6 +2860,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2773,6 +2908,11 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2795,11 +2935,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2875,6 +3010,14 @@ msgstr ""
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3126,6 +3269,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3223,12 +3371,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3249,7 +3391,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3294,8 +3435,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3316,6 +3457,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3528,12 +3674,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
diff --git a/addons/crm/i18n/it.po b/addons/crm/i18n/it.po
index ea1d56b8bad..4438e51b114 100644
--- a/addons/crm/i18n/it.po
+++ b/addons/crm/i18n/it.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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-24 09:40+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-11-25 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr "Scenario Caso"
 msgid "Visibility"
 msgstr "Visibilità"
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome di modulo non valido nella definizione dell'azione."
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -149,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr "Calendario Risorse"
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -292,11 +286,6 @@ msgstr "Risposte escluse:"
 msgid "Sections"
 msgstr "Sezioni"
 
-#. module: crm
-#: 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!"
-
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "_Merge"
@@ -551,11 +540,6 @@ msgstr "Crea Opportunità"
 msgid "August"
 msgstr "Agosto"
 
-#. module: crm
-#: field:crm.segmentation,sales_purchase_active:0
-msgid "Use The Sales Purchase Rules"
-msgstr "Utilizza Regole Vendite Acquisti"
-
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: view:crm.lead:0
@@ -668,6 +652,11 @@ msgstr ""
 "Intervallo. Questa è l'impressione iniziale predefinita nel caso in cui il "
 "Partner non fosse titolare di Eventi"
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -827,7 +816,6 @@ msgstr "Dashboard statistiche"
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -1065,6 +1053,13 @@ msgstr "<"
 msgid "Mobile"
 msgstr "Cellulare"
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1282,11 +1277,6 @@ msgstr "Scenario"
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1494,6 +1484,11 @@ msgstr "Riepilogo Opportunità"
 msgid "Search"
 msgstr "Cerca"
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1605,11 +1600,6 @@ msgstr "Categoria Telefonata"
 msgid "Invite People"
 msgstr "Invita persone"
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr "Opportunità per categorie"
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1697,11 +1687,6 @@ msgstr ""
 msgid "Wizard"
 msgstr "Wizard"
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1941,10 +1926,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -2027,9 +2010,9 @@ msgid "Priority"
 msgstr "Priorità"
 
 #. module: crm
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere univoco!"
+#: field:crm.segmentation,sales_purchase_active:0
+msgid "Use The Sales Purchase Rules"
+msgstr "Utilizza Regole Vendite Acquisti"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
@@ -2219,6 +2202,11 @@ msgstr "Ripristina a Non confermato"
 msgid "Note"
 msgstr "Note"
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2431,11 +2419,6 @@ msgstr "Allegati"
 msgid "Weekly"
 msgstr "Settimanalmente"
 
-#. module: crm
-#: sql_constraint:ir.ui.view_sc:0
-msgid "Shortcut for this menu already exists!"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
@@ -2469,11 +2452,6 @@ msgstr "Altro"
 msgid "Done"
 msgstr "Completato"
 
-#. module: crm
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
 msgid "Max Interval"
@@ -2514,14 +2492,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2991,6 +2961,11 @@ msgstr "Riepilogo chiamate"
 msgid "Operator"
 msgstr "Operatore"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -3013,11 +2988,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Errore! Non è possibile creare un menù ricorsivo"
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -3352,6 +3322,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3449,12 +3424,6 @@ msgstr "Si deve verificare che questo partner non esista già."
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3475,7 +3444,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr "Non è stata ritrovata email per il tuo indirizzo"
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3520,8 +3488,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3542,6 +3510,11 @@ msgstr "Contatto Partner"
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3556,11 +3529,6 @@ msgstr ""
 msgid "Close"
 msgstr "Chiudi"
 
-#. module: crm
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
@@ -3989,6 +3957,9 @@ msgstr "Newsletter"
 #~ msgid "Mail to these emails"
 #~ msgstr "Invia a queste email"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per Visualizzazione Architettura!"
+
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Speciali parole chiave da utilizzare nel Corpo"
 
@@ -4217,6 +4188,12 @@ msgstr "Newsletter"
 #~ msgid "Section Code"
 #~ msgstr "Codice Sezione"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
+
 #~ msgid "General Description"
 #~ msgstr "Descrizione generale"
 
@@ -4343,6 +4320,9 @@ msgstr "Newsletter"
 #~ msgid "Trigger Date"
 #~ msgstr "Data Avvio Automatico"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome di modulo non valido nella definizione dell'azione."
+
 #~ msgid "%(case_description)s = Case description"
 #~ msgstr "%(case_description)s = Descrizione del Caso"
 
@@ -5320,6 +5300,9 @@ msgstr "Newsletter"
 #~ msgid "Extended Options..."
 #~ msgstr "Opzioni estese..."
 
+#~ msgid "Opportunities By Categories"
+#~ msgstr "Opportunità per categorie"
+
 #, python-format
 #~ msgid "Lead "
 #~ msgstr "Iniziativa "
@@ -5333,6 +5316,15 @@ msgstr "Newsletter"
 #~ msgstr ""
 #~ "Chiusa/Annullata telefonata \\nChiamata non convertita in opportunità"
 
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Errore! Non è possibile creare un menù ricorsivo"
+
 #, python-format
 #~ msgid "is converted to Opportunity."
 #~ msgstr "è convertito a Opportunità"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "L'ID del certificato del modulo deve essere unico!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Il nome del modulo deve essere univoco!"
diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po
index f586640aa30..1d54e50e466 100644
--- a/addons/crm/i18n/ja.po
+++ b/addons/crm/i18n/ja.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-12 17:16+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Japanese <ja@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:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -54,11 +54,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -114,11 +109,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -128,10 +118,14 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
 
 #. module: crm
@@ -151,7 +145,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -263,6 +256,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -273,12 +275,6 @@ msgstr ""
 msgid "Criteria"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -320,6 +316,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -636,6 +639,11 @@ msgid ""
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -646,6 +654,13 @@ msgstr ""
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -779,7 +794,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -806,15 +820,17 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
 msgstr ""
 
 #. module: crm
@@ -849,13 +865,6 @@ msgstr ""
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1021,6 +1030,13 @@ msgstr ""
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1057,11 +1073,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
 
 #. module: crm
@@ -1069,11 +1083,6 @@ msgstr ""
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1090,6 +1099,12 @@ msgstr ""
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1110,6 +1125,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1210,11 +1237,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1223,11 +1252,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1300,20 +1324,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1407,13 +1439,14 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1421,6 +1454,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1532,11 +1570,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1568,6 +1601,16 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1578,14 +1621,18 @@ msgid "Name"
 msgstr ""
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1609,11 +1656,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1635,6 +1677,11 @@ msgstr ""
 msgid "High"
 msgstr ""
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1812,6 +1859,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1833,10 +1889,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1944,9 +1998,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1956,8 +2009,10 @@ msgid "Error !"
 msgstr ""
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2108,6 +2163,11 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2140,6 +2200,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2160,6 +2229,16 @@ msgstr ""
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2195,6 +2274,12 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2238,6 +2323,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2279,6 +2390,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2332,12 +2451,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2447,10 +2560,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2501,8 +2612,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2668,14 +2779,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2713,6 +2832,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2735,6 +2861,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2774,6 +2909,11 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2796,11 +2936,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2876,6 +3011,14 @@ msgstr ""
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3127,6 +3270,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3224,12 +3372,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3250,7 +3392,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3295,8 +3436,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3317,6 +3458,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3529,12 +3675,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
diff --git a/addons/crm/i18n/ko.po b/addons/crm/i18n/ko.po
index e1d0f9ba93f..28b75f652de 100644
--- a/addons/crm/i18n/ko.po
+++ b/addons/crm/i18n/ko.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-18 06:01+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-10-30 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -54,11 +54,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -114,11 +109,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr "케이스"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -128,11 +118,15 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
-msgstr "계산 후, 세그먼테이션 기준에 부응하는 파트너에 추가될 파트너 카테고리."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
+msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -151,7 +145,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -263,6 +256,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -273,12 +275,6 @@ msgstr ""
 msgid "Criteria"
 msgstr "범주"
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -320,6 +316,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -638,6 +641,11 @@ msgstr ""
 "최대 간격' 계산에 앞서는 기간을 위한 디폴트 마인드 상태.\r\n"
 "파트너에게 이벤트가 없을 경우,  디폴트로 마인드의 시작 상태임."
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -648,6 +656,13 @@ msgstr "프로파일링 옵션"
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr "계산 후, 세그먼테이션 기준에 부응하는 파트너에 추가될 파트너 카테고리."
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -781,7 +796,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -808,16 +822,18 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
+msgstr "기간 당 일 수"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -851,13 +867,6 @@ msgstr "배타적"
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1023,6 +1032,13 @@ msgstr ""
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1059,23 +1075,16 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
-msgstr "다음 액션"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
+msgstr ""
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1092,6 +1101,12 @@ msgstr "마감 시한"
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1112,6 +1127,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1212,11 +1239,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1225,11 +1254,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1302,20 +1326,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
-msgstr "기간 당 일 수"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
+msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1411,13 +1443,14 @@ msgstr "날짜"
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1425,6 +1458,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1536,11 +1574,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1572,6 +1605,16 @@ msgstr "="
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1582,14 +1625,18 @@ msgid "Name"
 msgstr "이름"
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1613,11 +1660,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1639,6 +1681,11 @@ msgstr ""
 msgid "High"
 msgstr "높음"
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1816,6 +1863,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1837,10 +1893,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1948,9 +2002,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1960,8 +2013,10 @@ msgid "Error !"
 msgstr "에러!"
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2112,6 +2167,11 @@ msgstr ""
 msgid "Note"
 msgstr "노트"
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2144,6 +2204,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2164,6 +2233,16 @@ msgstr "보류"
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2199,6 +2278,12 @@ msgstr ""
 msgid "Active"
 msgstr "활성"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2242,6 +2327,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2283,6 +2394,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2336,12 +2455,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자가 포함되면 안됩니다."
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2451,10 +2564,8 @@ msgid ""
 msgstr "이 인터벌, 지난 X 기간 동안 발생한 모든 이벤트에 대해 계산을 수행합니다."
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2505,8 +2616,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2672,14 +2783,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2717,6 +2836,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2739,6 +2865,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2778,6 +2913,11 @@ msgstr ""
 msgid "Operator"
 msgstr "오퍼레이터"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2800,11 +2940,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2880,6 +3015,14 @@ msgstr "채널"
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr "다음 액션"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3131,6 +3274,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3228,12 +3376,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3254,7 +3396,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3299,8 +3440,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3321,6 +3462,11 @@ msgstr "파트너 연락처"
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3533,12 +3679,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
@@ -3615,6 +3755,9 @@ msgstr ""
 #~ msgid "Estimates"
 #~ msgstr "추정"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
+
 #~ msgid ""
 #~ "The generic Open ERP Customer Relationship Management\n"
 #~ "system enables a group of people to intelligently and efficiently manage\n"
@@ -3760,6 +3903,10 @@ msgstr ""
 #~ msgid "General Description"
 #~ msgstr "일반 설명"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자가 포함되면 안됩니다."
+
 #, python-format
 #~ msgid "open"
 #~ msgstr "열기"
@@ -3834,6 +3981,9 @@ msgstr ""
 #~ msgid "Create menus for a case section"
 #~ msgstr "케이스 섹션을 위한 메뉴 만들기"
 
+#~ msgid "Cases"
+#~ msgstr "케이스"
+
 #~ msgid "Add watchers (Cc)"
 #~ msgstr "워쳐 추가 (Cc)"
 
diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po
index dadf06adb66..88ccad87b04 100644
--- a/addons/crm/i18n/lt.po
+++ b/addons/crm/i18n/lt.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 14:03+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-10-31 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
@@ -54,11 +54,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -114,11 +109,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr "Įvykiai"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -128,13 +118,15 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
-"Partnerio kategorija, kuri bus pridėta partneriams, kurie atitinka "
-"segmentavimo kriterijus po segmentavimo."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -153,7 +145,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -265,6 +256,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -275,12 +275,6 @@ msgstr ""
 msgid "Criteria"
 msgstr "Kriterijus"
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -322,6 +316,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -641,6 +642,11 @@ msgstr ""
 "intervalas\" skaičiavimo. Tai pradinė būsena pagal nutylėjimą, jei partneris "
 "neturi įvykių."
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -651,6 +657,15 @@ msgstr "Profiliavimo parinktys"
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+"Partnerio kategorija, kuri bus pridėta partneriams, kurie atitinka "
+"segmentavimo kriterijus po segmentavimo."
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -784,7 +799,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -811,16 +825,18 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
+msgstr "Dienų skaičius periode"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -854,13 +870,6 @@ msgstr "Išorinis"
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1026,6 +1035,13 @@ msgstr "<"
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1062,23 +1078,16 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
-msgstr "Kitas veiksmas"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
+msgstr ""
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1095,6 +1104,12 @@ msgstr "Galutinis terminas"
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1115,6 +1130,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1215,11 +1242,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1228,11 +1257,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Netinkamas XML architektūros peržiūrai!"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1305,20 +1329,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
-msgstr "Dienų skaičius periode"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
+msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1414,13 +1446,14 @@ msgstr "Data"
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1428,6 +1461,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1539,11 +1577,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1575,6 +1608,16 @@ msgstr "="
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1585,14 +1628,18 @@ msgid "Name"
 msgstr "Pavadinimas"
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1616,11 +1663,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1642,6 +1684,11 @@ msgstr ""
 msgid "High"
 msgstr "Didelis"
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1819,6 +1866,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1840,10 +1896,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1951,9 +2005,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1963,8 +2016,10 @@ msgid "Error !"
 msgstr "Klaida!"
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2115,6 +2170,11 @@ msgstr ""
 msgid "Note"
 msgstr "Užrašai"
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2147,6 +2207,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2167,6 +2236,16 @@ msgstr "Laukiama"
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2202,6 +2281,12 @@ msgstr ""
 msgid "Active"
 msgstr "Aktyvus"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2245,6 +2330,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2286,6 +2397,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2339,13 +2458,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objekto pavadinimas turi prasidėti x_ ir neturėti jokių specialių simbolių!"
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2457,10 +2569,8 @@ msgstr ""
 "praėjus X periodų."
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2511,8 +2621,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2678,14 +2788,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2723,6 +2841,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2745,6 +2870,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2784,6 +2918,11 @@ msgstr ""
 msgid "Operator"
 msgstr "Valdiklis"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2806,11 +2945,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2886,6 +3020,14 @@ msgstr "Šaltinis"
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr "Kitas veiksmas"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3137,6 +3279,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3234,12 +3381,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3260,7 +3401,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr "Jūsų kompanijos adrese nerastas el. pašto ID!"
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3305,8 +3445,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3327,6 +3467,11 @@ msgstr "Partnerio adresas"
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3539,12 +3684,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
@@ -3747,6 +3886,9 @@ msgstr ""
 #~ msgid "Watchers Emails"
 #~ msgstr "Stebėtojų el. paštai"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Netinkamas XML architektūros peržiūrai!"
+
 #~ msgid "%(partner_email)s = Partner email"
 #~ msgstr "%(partner_email)s = Partnerio el. paštas"
 
@@ -3792,6 +3934,11 @@ msgstr ""
 #~ msgid "List"
 #~ msgstr "Sąrašas"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objekto pavadinimas turi prasidėti x_ ir neturėti jokių specialių simbolių!"
+
 #~ msgid "Delay After Trigger Date:"
 #~ msgstr "Atidėti po įvykio datos:"
 
@@ -3813,6 +3960,9 @@ msgstr ""
 #~ msgid "Button Pressed"
 #~ msgstr "Nuspaustas mygtukas"
 
+#~ msgid "Cases"
+#~ msgstr "Įvykiai"
+
 #, python-format
 #~ msgid ""
 #~ "You can not escalate this case.\n"
diff --git a/addons/crm/i18n/lv.po b/addons/crm/i18n/lv.po
index 626905c9b77..650387a38c7 100644
--- a/addons/crm/i18n/lv.po
+++ b/addons/crm/i18n/lv.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-10-12 10:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@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:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -54,11 +54,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -114,11 +109,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -128,10 +118,14 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
 
 #. module: crm
@@ -151,7 +145,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -263,6 +256,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -273,12 +275,6 @@ msgstr ""
 msgid "Criteria"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -320,6 +316,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -636,6 +639,11 @@ msgid ""
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -646,6 +654,13 @@ msgstr ""
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -779,7 +794,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -806,15 +820,17 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
 msgstr ""
 
 #. module: crm
@@ -849,13 +865,6 @@ msgstr ""
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1021,6 +1030,13 @@ msgstr ""
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1057,11 +1073,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
 
 #. module: crm
@@ -1069,11 +1083,6 @@ msgstr ""
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1090,6 +1099,12 @@ msgstr ""
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1110,6 +1125,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1210,11 +1237,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1223,11 +1252,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1300,20 +1324,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1407,13 +1439,14 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1421,6 +1454,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1532,11 +1570,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1568,6 +1601,16 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1578,14 +1621,18 @@ msgid "Name"
 msgstr ""
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1609,11 +1656,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1635,6 +1677,11 @@ msgstr ""
 msgid "High"
 msgstr ""
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1812,6 +1859,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1833,10 +1889,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1944,9 +1998,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1956,8 +2009,10 @@ msgid "Error !"
 msgstr ""
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2108,6 +2163,11 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2140,6 +2200,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2160,6 +2229,16 @@ msgstr ""
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2195,6 +2274,12 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2238,6 +2323,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2279,6 +2390,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2332,12 +2451,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2447,10 +2560,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2501,8 +2612,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2668,14 +2779,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2713,6 +2832,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2735,6 +2861,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2774,6 +2909,11 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2796,11 +2936,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2876,6 +3011,14 @@ msgstr ""
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3127,6 +3270,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3224,12 +3372,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3250,7 +3392,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3295,8 +3436,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3317,6 +3458,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3529,12 +3675,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
diff --git a/addons/crm/i18n/mn.po b/addons/crm/i18n/mn.po
index 4c689b5d1c9..c85c4f70603 100644
--- a/addons/crm/i18n/mn.po
+++ b/addons/crm/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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-29 11:42+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -54,11 +54,6 @@ msgstr "Тохиолдын үе"
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -114,11 +109,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -128,10 +118,14 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
 
 #. module: crm
@@ -151,7 +145,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -263,6 +256,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -273,12 +275,6 @@ msgstr "Шинэ имэйл илгээх"
 msgid "Criteria"
 msgstr "Шалгуур"
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -320,6 +316,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -636,6 +639,11 @@ msgid ""
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -646,6 +654,13 @@ msgstr ""
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -779,7 +794,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -806,15 +820,17 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Үргэлжлүүлэх"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
+msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
 msgstr ""
 
 #. module: crm
@@ -849,13 +865,6 @@ msgstr ""
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1021,6 +1030,13 @@ msgstr ""
 msgid "Mobile"
 msgstr "Гар утас"
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1057,23 +1073,16 @@ msgid "Meetings"
 msgstr "Уулзалт"
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
-msgstr "Дараагийн үйлдэл"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
+msgstr ""
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1090,6 +1099,12 @@ msgstr "Дуусах"
 msgid "_Cancel"
 msgstr "_Болих"
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1110,6 +1125,18 @@ msgstr ""
 msgid "Attendees"
 msgstr "Оролцогчид"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1210,11 +1237,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr "Шат"
 
@@ -1223,11 +1252,6 @@ msgstr "Шат"
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Архитектур харахад зориулсан алдаатай XML"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1300,20 +1324,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr "Үргэлжлүүлэх"
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1407,13 +1439,14 @@ msgstr "Огноо"
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1421,6 +1454,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1532,11 +1570,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1568,6 +1601,16 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1577,17 +1620,21 @@ msgstr ""
 msgid "Name"
 msgstr "Нэр"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,alarm_id:0
 #: field:crm.meeting,base_calendar_alarm_id:0
 msgid "Alarm"
 msgstr "Түгшүүр"
 
-#. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1609,11 +1656,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1635,6 +1677,11 @@ msgstr ""
 msgid "High"
 msgstr "Өндөр"
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1812,6 +1859,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1833,10 +1889,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1944,9 +1998,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1956,8 +2009,10 @@ msgid "Error !"
 msgstr ""
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2108,6 +2163,11 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2140,6 +2200,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2160,6 +2229,16 @@ msgstr "Шийд хүлээсэн"
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2195,6 +2274,12 @@ msgstr "Утас"
 msgid "Active"
 msgstr "Идэвхитэй"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2238,6 +2323,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2279,6 +2390,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2332,12 +2451,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "Объектын нэр нь х_ болон онцгой тэмдэгтийн хослол байх ёстой"
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2447,10 +2560,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2501,8 +2612,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2668,14 +2779,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2713,6 +2832,13 @@ msgstr "Цуцалсан"
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2735,6 +2861,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2774,6 +2909,11 @@ msgstr "Дуудлагын товчоо"
 msgid "Operator"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2796,11 +2936,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2876,6 +3011,14 @@ msgstr "Суваг"
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr "Дараагийн үйлдэл"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3127,6 +3270,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3224,12 +3372,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3250,7 +3392,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3295,8 +3436,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3317,6 +3458,11 @@ msgstr "Харьцах хүн"
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3529,12 +3675,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
@@ -3643,6 +3783,10 @@ msgstr "Мэдээллийн товхимол"
 #~ msgid "Email Add CC"
 #~ msgstr "Имэйлд CC нэмэх"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "Объектын нэр нь х_ болон онцгой тэмдэгтийн хослол байх ёстой"
+
 #~ msgid "All Meetings"
 #~ msgstr "Бүх уулзалтууд"
 
@@ -3679,6 +3823,9 @@ msgstr "Мэдээллийн товхимол"
 #~ msgid "Pending Claims"
 #~ msgstr "Шаардлага хүлээх"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Архитектур харахад зориулсан алдаатай XML"
+
 #~ msgid "Value Claims"
 #~ msgstr "Заргын утга"
 
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index 7c7da3cc6a2..53314911ee9 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-12-01 08:44+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-02 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr "Stadium dossier"
 msgid "Visibility"
 msgstr "Zichtbaarheid"
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de definitie van de actie."
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -149,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr "Resource's agenda"
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -296,11 +290,6 @@ msgstr "Uitgesloten antwoorden:"
 msgid "Sections"
 msgstr "Secties"
 
-#. module: crm
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "_Merge"
@@ -555,11 +544,6 @@ msgstr "Maak verkoopkans"
 msgid "August"
 msgstr "Augustus"
 
-#. module: crm
-#: field:crm.segmentation,sales_purchase_active:0
-msgid "Use The Sales Purchase Rules"
-msgstr "Gebruik Verkoop-/Inkoop-regels"
-
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: view:crm.lead:0
@@ -675,6 +659,11 @@ msgstr ""
 "berekening. Dit is de beginwaarde van de loyaliteit als er nog geen "
 "gebeurtenissen voor deze relatie hebben plaatsgevonden."
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -840,7 +829,6 @@ msgstr "Statistisch dashboard"
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -1111,6 +1099,14 @@ msgstr "<"
 msgid "Mobile"
 msgstr "Mobiel"
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+"Er zijn geen andere 'Open' of 'Wachtend' verkoopkansen voor de relatie '%s'."
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1336,11 +1332,6 @@ msgstr "Fase"
 msgid "History Information"
 msgstr "Historie informatie"
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1548,6 +1539,11 @@ msgstr "Samenvatting verkoopkans"
 msgid "Search"
 msgstr "Zoeken"
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1660,11 +1656,6 @@ msgstr "Telefoongesprek categoriën"
 msgid "Invite People"
 msgstr "Personen uitnodigen"
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr "Verkoopkansen op categorie"
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1761,11 +1752,6 @@ msgstr "De"
 msgid "Wizard"
 msgstr "Assistent"
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Regels worden niet ondersteund voor osv_memory objecten !"
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -2007,12 +1993,9 @@ msgid "Select stages for this Sales Team"
 msgstr "Selecteer stadia voor dit verkoopteam"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
-"Er zijn geen andere 'Open' of 'Wachtend' verkoopkansen voor de relatie '%s'."
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
@@ -2094,9 +2077,9 @@ msgid "Priority"
 msgstr "Prioriteit"
 
 #. module: crm
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "De modulenaam moet uniek zijn !"
+#: field:crm.segmentation,sales_purchase_active:0
+msgid "Use The Sales Purchase Rules"
+msgstr "Gebruik Verkoop-/Inkoop-regels"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
@@ -2290,6 +2273,11 @@ msgstr "Terugzetten naar onbevestigd"
 msgid "Note"
 msgstr "Opmerking"
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2529,11 +2517,6 @@ msgstr "Bijlagen"
 msgid "Weekly"
 msgstr "Wekelijks"
 
-#. module: crm
-#: sql_constraint:ir.ui.view_sc:0
-msgid "Shortcut for this menu already exists!"
-msgstr "Dit menu heeft al een snelkoppeling!"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
@@ -2570,11 +2553,6 @@ msgstr "Overig"
 msgid "Done"
 msgstr "Klaar"
 
-#. module: crm
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "Regel moet tenminste één toegangsrecht aangevinkt hebben !"
-
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
 msgid "Max Interval"
@@ -2615,13 +2593,6 @@ msgstr "Woonplaats"
 msgid "Busy"
 msgstr "Bezet"
 
-#. module: crm
-#: 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: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -3100,6 +3071,11 @@ msgstr "Samenvatting gesprek"
 msgid "Operator"
 msgstr "Operator"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Telefoongesprek naar telefoongesprek"
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -3124,11 +3100,6 @@ msgstr ""
 "Deze adressen krijgen een kopie van deze email. Wijzig het globale CC veld "
 "van dit dossier om de permanente CC lijst te wijzigen"
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fout! U kunt geen recursief menu maken."
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -3479,6 +3450,11 @@ msgstr ""
 "uitgaande email voor dit record voorafgaand aan het versturen. Scheidt meer "
 "email adressen met een comma"
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3576,14 +3552,6 @@ msgstr "U dient te controleren of deze relatie niet al bestaat."
 msgid "Delay to Open"
 msgstr "Vertraging tot openen"
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-"Er is geen stadium voor gewonnen verkoopkansen gedefinieerd voor dit "
-"verkoopteam."
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3604,7 +3572,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr "Geen email-ID gevonden voor uw bedrijfsadres!"
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr "Verkoopkansen op stadium"
@@ -3649,9 +3616,9 @@ msgid "Need Consulting"
 msgstr "Heeft dienstverlening nodig"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Telefoongesprek naar telefoongesprek"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
+msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -3671,6 +3638,11 @@ msgstr "Contactpersoon relatie"
 msgid "Recurrent ID date"
 msgstr "Herhaling ID datum"
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3685,11 +3657,6 @@ msgstr "Samengevoegd in verkoopkans: %s"
 msgid "Close"
 msgstr "Afsluiten"
 
-#. module: crm
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
@@ -4217,6 +4184,9 @@ msgstr "Nieuwsbrief"
 #~ msgid "%(case_subject)s = Case subject"
 #~ msgstr "%(case_subject)s = Onderwerp dossier"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML voor weergave!"
+
 #~ msgid ""
 #~ "The generic Open ERP Customer Relationship Management\n"
 #~ "system enables a group of people to intelligently and efficiently manage\n"
@@ -4352,6 +4322,11 @@ msgstr "Nieuwsbrief"
 #~ msgid "General Description"
 #~ msgstr "Algemene omschrijving"
 
+#~ 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 ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr ""
@@ -5471,6 +5446,9 @@ msgstr "Nieuwsbrief"
 #~ msgid "Meetings Tree"
 #~ msgstr "Afspraken"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
+
 #, python-format
 #~ msgid "is converted to Opportunity."
 #~ msgstr "is omgezet naar verkoopkans."
@@ -5482,11 +5460,41 @@ msgstr "Nieuwsbrief"
 #~ msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
 #~ msgstr "Gesloten/Geannuleerd \\nLeads konden niet omgezet in verkoopkans"
 
+#~ msgid "Opportunities By Categories"
+#~ msgstr "Verkoopkansen op categorie"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Regels worden niet ondersteund voor osv_memory objecten !"
+
 #, python-format
 #~ msgid "Lead "
 #~ msgstr "Lead "
 
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fout! U kunt geen recursief menu maken."
+
+#, python-format
+#~ msgid "There is no stage for won opportunities defined for this Sale Team."
+#~ msgstr ""
+#~ "Er is geen stadium voor gewonnen verkoopkansen gedefinieerd voor dit "
+#~ "verkoopteam."
+
 #, python-format
 #~ msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
 #~ msgstr ""
 #~ "Gesloten/geannuleerde telefoongesprek \\nKon niet omzetten naar verkoopkans"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "De modulenaam moet uniek zijn !"
+
+#~ msgid "Shortcut for this menu already exists!"
+#~ msgstr "Dit menu heeft al een snelkoppeling!"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "Regel moet tenminste één toegangsrecht aangevinkt hebben !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/crm/i18n/nl_BE.po b/addons/crm/i18n/nl_BE.po
index 29f03c50f9a..386e293bc58 100644
--- a/addons/crm/i18n/nl_BE.po
+++ b/addons/crm/i18n/nl_BE.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-04-10 09:40+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-10-30 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -113,11 +108,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -127,10 +117,14 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
 
 #. module: crm
@@ -150,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -262,6 +255,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -272,12 +274,6 @@ msgstr ""
 msgid "Criteria"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -319,6 +315,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -635,6 +638,11 @@ msgid ""
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -645,6 +653,13 @@ msgstr ""
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -778,7 +793,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -805,15 +819,17 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
 msgstr ""
 
 #. module: crm
@@ -848,13 +864,6 @@ msgstr ""
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1020,6 +1029,13 @@ msgstr ""
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1056,11 +1072,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
 
 #. module: crm
@@ -1068,11 +1082,6 @@ msgstr ""
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1089,6 +1098,12 @@ msgstr ""
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1109,6 +1124,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1209,11 +1236,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1222,11 +1251,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1299,20 +1323,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1406,13 +1438,14 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1420,6 +1453,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1531,11 +1569,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1567,6 +1600,16 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1577,14 +1620,18 @@ msgid "Name"
 msgstr ""
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1608,11 +1655,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1634,6 +1676,11 @@ msgstr ""
 msgid "High"
 msgstr ""
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1811,6 +1858,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1832,10 +1888,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1943,9 +1997,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1955,8 +2008,10 @@ msgid "Error !"
 msgstr ""
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2107,6 +2162,11 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2139,6 +2199,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2159,6 +2228,16 @@ msgstr ""
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2194,6 +2273,12 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2237,6 +2322,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2278,6 +2389,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2331,13 +2450,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: 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 karakters bevatten !"
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2447,10 +2559,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2501,8 +2611,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2668,14 +2778,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2713,6 +2831,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2735,6 +2860,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2774,6 +2908,11 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2796,11 +2935,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2876,6 +3010,14 @@ msgstr ""
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3127,6 +3269,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3224,12 +3371,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3250,7 +3391,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3295,8 +3435,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3317,6 +3457,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3529,12 +3674,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
@@ -3588,3 +3727,8 @@ msgstr ""
 #: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
 msgstr ""
+
+#~ 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 karakters bevatten !"
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index 7be11af0680..1710e7490c3 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-29 07: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-11-30 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr "Etap sprawy"
 msgid "Visibility"
 msgstr "Widoczność"
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -149,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr "Kalendarz zasobów"
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -291,11 +285,6 @@ msgstr "Wyłączając odpowiedzi :"
 msgid "Sections"
 msgstr "Sekcje"
 
-#. module: crm
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "ID certyfikatu modułu musi być unikalne !"
-
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "_Merge"
@@ -547,11 +536,6 @@ msgstr "Utwórz szansę"
 msgid "August"
 msgstr "Sierpień"
 
-#. module: crm
-#: field:crm.segmentation,sales_purchase_active:0
-msgid "Use The Sales Purchase Rules"
-msgstr "Zastosuj reguły sprzedaży/zakupu"
-
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: view:crm.lead:0
@@ -667,6 +651,11 @@ msgstr ""
 "Interwału'. To jest domyślny początkowy stan emocji, jeśli z partnerem nie "
 "było jeszcze żadnych zdarzeń."
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -829,7 +818,6 @@ msgstr "Konsola statystyk"
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -1070,6 +1058,13 @@ msgstr "<"
 msgid "Mobile"
 msgstr "Tel. komórkowy"
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1291,11 +1286,6 @@ msgstr "Etap"
 msgid "History Information"
 msgstr "Informacja o historii"
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1502,6 +1492,11 @@ msgstr "Podsumowanie szans"
 msgid "Search"
 msgstr "Wyszukaj"
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1613,11 +1608,6 @@ msgstr ""
 msgid "Invite People"
 msgstr "Zaproś uczestników"
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr "Szanse wg kategorii"
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1704,11 +1694,6 @@ msgstr ""
 msgid "Wizard"
 msgstr "Kreator"
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Reguły nie są obsługiwane dla obiektów osv_memory !"
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1942,10 +1927,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -2028,9 +2011,9 @@ msgid "Priority"
 msgstr "Priorytet"
 
 #. module: crm
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Nazwa modułu musi być unikalna !"
+#: field:crm.segmentation,sales_purchase_active:0
+msgid "Use The Sales Purchase Rules"
+msgstr "Zastosuj reguły sprzedaży/zakupu"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
@@ -2218,6 +2201,11 @@ msgstr "Przywróć do niepotwierdzonych"
 msgid "Note"
 msgstr "Uwaga"
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2428,11 +2416,6 @@ msgstr "Załączniki"
 msgid "Weekly"
 msgstr "Tygodniowo"
 
-#. module: crm
-#: sql_constraint:ir.ui.view_sc:0
-msgid "Shortcut for this menu already exists!"
-msgstr "Skrót dla tego menu już istnieje!"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
@@ -2466,11 +2449,6 @@ msgstr "Inne"
 msgid "Done"
 msgstr "Wykonano"
 
-#. module: crm
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "Reguła musi mieć zaznaczone co najmniej jedno prawo dostępu !"
-
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
 msgid "Max Interval"
@@ -2511,14 +2489,6 @@ msgstr "Miasto"
 msgid "Busy"
 msgstr "Zajęte"
 
-#. module: crm
-#: 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: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2987,6 +2957,11 @@ msgstr "Podsumowanie rozmowy"
 msgid "Operator"
 msgstr "Operator"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Telefon do telefonu"
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -3009,11 +2984,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -3348,6 +3318,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3445,12 +3420,6 @@ msgstr "Powinieneś sprawdzić, czy ten partner już istnieje."
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3471,7 +3440,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr "Brak ID email dla adresu twojej firmy !"
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr "Szanse wg etapów"
@@ -3516,9 +3484,9 @@ msgid "Need Consulting"
 msgstr "Potrzebne konsultacje"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Telefon do telefonu"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
+msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -3538,6 +3506,11 @@ msgstr "Kontakt do partnera"
 msgid "Recurrent ID date"
 msgstr "Data ID powtarzalności"
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3552,11 +3525,6 @@ msgstr "Połaczona z szansą: %s"
 msgid "Close"
 msgstr "Zamknij"
 
-#. module: crm
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Rozmiar pola nie może być mniejszy od 1 !"
-
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
@@ -3815,9 +3783,18 @@ msgstr "Biuletyn"
 #~ msgid "Estimates"
 #~ msgstr "Szacunki"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
 #~ msgid "Rules"
 #~ msgstr "Reguły"
 
+#~ 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 "Base Information"
 #~ msgstr "Informacja podstawowa"
 
@@ -4042,6 +4019,9 @@ msgstr "Biuletyn"
 #~ msgid "Existing Customer"
 #~ msgstr "Istniejący klient"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
 #~ msgid "Meetings Tree"
 #~ msgstr "Drzewo spotkań"
 
@@ -5291,3 +5271,27 @@ msgstr "Biuletyn"
 
 #~ msgid "Extended Options..."
 #~ msgstr "Opcje rozszerzone"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "ID certyfikatu modułu musi być unikalne !"
+
+#~ msgid "Opportunities By Categories"
+#~ msgstr "Szanse wg kategorii"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Reguły nie są obsługiwane dla obiektów osv_memory !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Nazwa modułu musi być unikalna !"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "Reguła musi mieć zaznaczone co najmniej jedno prawo dostępu !"
+
+#~ msgid "Shortcut for this menu already exists!"
+#~ msgstr "Skrót dla tego menu już istnieje!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Rozmiar pola nie może być mniejszy od 1 !"
diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po
index 50fe5f7987a..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-12 04:40+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 ca67fabf0f7..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-09 11:46+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-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -2951,7 +2951,7 @@ msgstr "Aviso"
 #: field:crm.phonecall,name:0
 #: view:res.partner:0
 msgid "Call Summary"
-msgstr "Sumário do Telefonêma"
+msgstr "Resumo da Chamada"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
diff --git a/addons/crm/i18n/ro.po b/addons/crm/i18n/ro.po
index d65deff0d77..e65c11db48b 100644
--- a/addons/crm/i18n/ro.po
+++ b/addons/crm/i18n/ro.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-08 13:28+0000\n"
 "Last-Translator: Valentin <vali_ile@tybmad.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-10-30 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -113,11 +108,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -127,10 +117,14 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
 
 #. module: crm
@@ -150,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -262,6 +255,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -272,12 +274,6 @@ msgstr ""
 msgid "Criteria"
 msgstr "Criterii"
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -319,6 +315,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -635,6 +638,11 @@ msgid ""
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -645,6 +653,13 @@ msgstr ""
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -778,7 +793,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -805,16 +819,18 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
+msgstr "Nr. de zile per perioada"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -848,13 +864,6 @@ msgstr "Selectie exclusiva"
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1020,6 +1029,13 @@ msgstr ""
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1056,11 +1072,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
 
 #. module: crm
@@ -1068,11 +1082,6 @@ msgstr ""
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1089,6 +1098,12 @@ msgstr "Urmatoarea data de actiune"
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1109,6 +1124,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1209,11 +1236,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1222,11 +1251,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1299,20 +1323,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
-msgstr "Nr. de zile per perioada"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
+msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1406,13 +1438,14 @@ msgstr "Data"
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1420,6 +1453,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1531,11 +1569,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1567,6 +1600,16 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1577,14 +1620,18 @@ msgid "Name"
 msgstr "Nume segment"
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1608,11 +1655,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1634,6 +1676,11 @@ msgstr ""
 msgid "High"
 msgstr ""
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1811,6 +1858,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1832,10 +1888,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1943,9 +1997,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1955,8 +2008,10 @@ msgid "Error !"
 msgstr ""
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2107,6 +2162,11 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2139,6 +2199,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2159,6 +2228,16 @@ msgstr ""
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2194,6 +2273,12 @@ msgstr ""
 msgid "Active"
 msgstr "Activ"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2237,6 +2322,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2278,6 +2389,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2331,12 +2450,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2446,10 +2559,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2500,8 +2611,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2667,14 +2778,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2712,6 +2831,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2734,6 +2860,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2773,6 +2908,11 @@ msgstr ""
 msgid "Operator"
 msgstr "Operator"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2795,11 +2935,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2875,6 +3010,14 @@ msgstr "Canal"
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3126,6 +3269,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3223,12 +3371,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3249,7 +3391,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3294,8 +3435,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3316,6 +3457,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3528,12 +3674,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index c83a2dcfd31..90f5b8af9d0 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.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-12 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/sk.po b/addons/crm/i18n/sk.po
index 3a77712a909..689bd4c3d74 100644
--- a/addons/crm/i18n/sk.po
+++ b/addons/crm/i18n/sk.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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-30 17:09+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@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-01 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -54,11 +54,6 @@ msgstr "Etapa udalosti"
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Neplatný názov modelu v akcii definície."
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -150,7 +145,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -291,11 +285,6 @@ msgstr ""
 msgid "Sections"
 msgstr "Sekcie"
 
-#. module: crm
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "_Merge"
@@ -543,11 +532,6 @@ msgstr "Vytvoriť príležitosť"
 msgid "August"
 msgstr "August"
 
-#. module: crm
-#: field:crm.segmentation,sales_purchase_active:0
-msgid "Use The Sales Purchase Rules"
-msgstr ""
-
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: view:crm.lead:0
@@ -655,6 +639,11 @@ msgid ""
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -805,7 +794,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -1042,6 +1030,13 @@ msgstr "<"
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1257,11 +1252,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neplatný súbor XML pre zobrazenie architektúry!"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1464,6 +1454,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1575,11 +1570,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1666,11 +1656,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1904,10 +1889,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1990,8 +1973,8 @@ msgid "Priority"
 msgstr "Priorita"
 
 #. module: crm
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
+#: field:crm.segmentation,sales_purchase_active:0
+msgid "Use The Sales Purchase Rules"
 msgstr ""
 
 #. module: crm
@@ -2180,6 +2163,11 @@ msgstr ""
 msgid "Note"
 msgstr "Poznámka"
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2390,11 +2378,6 @@ msgstr ""
 msgid "Weekly"
 msgstr ""
 
-#. module: crm
-#: sql_constraint:ir.ui.view_sc:0
-msgid "Shortcut for this menu already exists!"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
@@ -2428,11 +2411,6 @@ msgstr ""
 msgid "Done"
 msgstr ""
 
-#. module: crm
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
 msgid "Max Interval"
@@ -2473,13 +2451,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Názov objektu musí začínať x_ a nesmie obsahovať žiadne špeciálne znaky!"
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2938,6 +2909,11 @@ msgstr ""
 msgid "Operator"
 msgstr "Operátor"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2960,11 +2936,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -3299,6 +3270,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3396,12 +3372,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3422,7 +3392,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3467,8 +3436,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3489,6 +3458,11 @@ msgstr "Kontakt partnera"
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3503,11 +3477,6 @@ msgstr ""
 msgid "Close"
 msgstr "Zatvorené"
 
-#. module: crm
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
@@ -3763,6 +3732,9 @@ msgstr ""
 #~ msgid "All Cases"
 #~ msgstr "Všetky prípady"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neplatný názov modelu v akcii definície."
+
 #~ msgid "Planned costs"
 #~ msgstr "Plánované náklady"
 
@@ -3802,6 +3774,9 @@ msgstr ""
 #~ msgid "Category of case"
 #~ msgstr "Kategória prípadu"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neplatný súbor XML pre zobrazenie architektúry!"
+
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Špeciálne kľúčové slová pre použitie v obsahu"
 
@@ -3886,6 +3861,11 @@ msgstr ""
 #~ msgid "General Description"
 #~ msgstr "Všeobecný opis"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Názov objektu musí začínať x_ a nesmie obsahovať žiadne špeciálne znaky!"
+
 #~ msgid "Set priority to"
 #~ msgstr "Nastavenie priority pre"
 
diff --git a/addons/crm/i18n/sl.po b/addons/crm/i18n/sl.po
index d72d84774bd..152495f9921 100644
--- a/addons/crm/i18n/sl.po
+++ b/addons/crm/i18n/sl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 14: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-10-31 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Napačno ime modela v definiciji dejanja."
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -113,11 +108,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr "Primeri"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -127,10 +117,14 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
 
 #. module: crm
@@ -150,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -262,6 +255,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -272,12 +274,6 @@ msgstr ""
 msgid "Criteria"
 msgstr "Pogoji"
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -319,6 +315,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -635,6 +638,11 @@ msgid ""
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -645,6 +653,13 @@ msgstr ""
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -778,7 +793,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -805,15 +819,17 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
 msgstr ""
 
 #. module: crm
@@ -848,13 +864,6 @@ msgstr "Ekskluzivno"
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1020,6 +1029,13 @@ msgstr "<"
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1056,11 +1072,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
 
 #. module: crm
@@ -1068,11 +1082,6 @@ msgstr ""
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1089,6 +1098,12 @@ msgstr "Rok"
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1109,6 +1124,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1209,11 +1236,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1222,11 +1251,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1299,20 +1323,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1406,13 +1438,14 @@ msgstr "Datum"
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1420,6 +1453,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1531,11 +1569,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1567,6 +1600,16 @@ msgstr "="
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1577,14 +1620,18 @@ msgid "Name"
 msgstr "Naziv"
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1608,11 +1655,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1634,6 +1676,11 @@ msgstr ""
 msgid "High"
 msgstr "Visoka"
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1811,6 +1858,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1832,10 +1888,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1943,9 +1997,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1955,8 +2008,10 @@ msgid "Error !"
 msgstr "Napaka!"
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2107,6 +2162,11 @@ msgstr ""
 msgid "Note"
 msgstr "Opomba"
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2139,6 +2199,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2159,6 +2228,16 @@ msgstr "Na čakanju"
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2194,6 +2273,12 @@ msgstr ""
 msgid "Active"
 msgstr "Aktivno"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2237,6 +2322,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2278,6 +2389,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2331,13 +2450,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2447,10 +2559,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2501,8 +2611,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2668,14 +2778,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2713,6 +2831,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2735,6 +2860,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2774,6 +2908,11 @@ msgstr ""
 msgid "Operator"
 msgstr "Operater"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2796,11 +2935,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2876,6 +3010,14 @@ msgstr "Kanal"
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3127,6 +3269,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3224,12 +3371,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3250,7 +3391,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3295,8 +3435,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3317,6 +3457,11 @@ msgstr "Stik partnerja"
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3529,12 +3674,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
@@ -3589,6 +3728,14 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
+
 #~ msgid "Remind Partner"
 #~ msgstr "Opomni partnerja"
 
@@ -3604,6 +3751,9 @@ msgstr ""
 #~ msgid "Created"
 #~ msgstr "Ustvarjeno"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Napačno ime modela v definiciji dejanja."
+
 #~ msgid "All Cases"
 #~ msgstr "Vsi primeri"
 
@@ -3619,6 +3769,9 @@ msgstr ""
 #~ msgid "Case history"
 #~ msgstr "Zgodovina primera"
 
+#~ msgid "Cases"
+#~ msgstr "Primeri"
+
 #~ msgid "Planned Costs"
 #~ msgstr "Načrtovani stroški"
 
diff --git a/addons/crm/i18n/sq.po b/addons/crm/i18n/sq.po
index c89605172b6..c06510b5257 100644
--- a/addons/crm/i18n/sq.po
+++ b/addons/crm/i18n/sq.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -54,11 +54,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -114,11 +109,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -128,10 +118,14 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
 
 #. module: crm
@@ -151,7 +145,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -263,6 +256,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -273,12 +275,6 @@ msgstr ""
 msgid "Criteria"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -320,6 +316,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -636,6 +639,11 @@ msgid ""
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -646,6 +654,13 @@ msgstr ""
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -779,7 +794,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -806,15 +820,17 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
 msgstr ""
 
 #. module: crm
@@ -849,13 +865,6 @@ msgstr ""
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1021,6 +1030,13 @@ msgstr ""
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1057,11 +1073,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
 
 #. module: crm
@@ -1069,11 +1083,6 @@ msgstr ""
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1090,6 +1099,12 @@ msgstr ""
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1110,6 +1125,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1210,11 +1237,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1223,11 +1252,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1300,20 +1324,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1407,13 +1439,14 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1421,6 +1454,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1532,11 +1570,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1568,6 +1601,16 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1578,14 +1621,18 @@ msgid "Name"
 msgstr ""
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1609,11 +1656,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1635,6 +1677,11 @@ msgstr ""
 msgid "High"
 msgstr ""
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1812,6 +1859,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1833,10 +1889,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1944,9 +1998,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1956,8 +2009,10 @@ msgid "Error !"
 msgstr ""
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2108,6 +2163,11 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2140,6 +2200,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2160,6 +2229,16 @@ msgstr ""
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2195,6 +2274,12 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2238,6 +2323,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2279,6 +2390,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2332,12 +2451,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2447,10 +2560,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2501,8 +2612,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2668,14 +2779,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2713,6 +2832,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2735,6 +2861,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2774,6 +2909,11 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2796,11 +2936,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2876,6 +3011,14 @@ msgstr ""
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3127,6 +3270,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3224,12 +3372,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3250,7 +3392,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3295,8 +3436,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3317,6 +3458,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3529,12 +3675,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
diff --git a/addons/crm/i18n/sr.po b/addons/crm/i18n/sr.po
index d590f953a6f..0d01744e951 100644
--- a/addons/crm/i18n/sr.po
+++ b/addons/crm/i18n/sr.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-04 09:33+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-06 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -54,11 +54,6 @@ msgstr "Novo Slucaja"
 msgid "Visibility"
 msgstr "Vidljivost"
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Neispravno ime modela u definiciji akcije."
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -114,11 +109,6 @@ msgstr "Ne mogu dodati napomenu!"
 msgid "Stage Name"
 msgstr "Ime Nivoa"
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr "Slucajevi"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -128,13 +118,15 @@ msgid "Day"
 msgstr "Dan"
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
-"Partnerova kategorija koja ce biti pridodata partnerima koji se podudaraju u "
-"segmentacionim kriterijumima nakon poredjenja."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -153,7 +145,6 @@ msgid "Resource's Calendar"
 msgstr "Kalendar Resursa"
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -266,6 +257,15 @@ msgstr "Opt-Out"
 msgid "The opportunity '%s' has been marked as lost."
 msgstr "Prilika '%s' je obelezena kao izgubljena."
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -276,12 +276,6 @@ msgstr "Posalji Novi Email"
 msgid "Criteria"
 msgstr "Kriterijum"
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr "je konvertovano u Priliku"
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -326,6 +320,13 @@ msgstr "Javno"
 msgid "Campaigns"
 msgstr "Kampanje"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -651,6 +652,11 @@ msgstr ""
 "kalkulacije. Ovo je podrazumevano startno stanje svesti ukoliko partner "
 "miruje."
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -661,6 +667,15 @@ msgstr "Opcije Profiliranja"
 msgid "#Phone calls"
 msgstr "#Tel Pozivi"
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+"Partnerova kategorija koja ce biti pridodata partnerima koji se podudaraju u "
+"segmentacionim kriterijumima nakon poredjenja."
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -807,7 +822,6 @@ msgstr "Glavna Tabla Statistike"
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -834,16 +848,18 @@ msgid "Search Phonecalls"
 msgstr "Pretrazi Telefonske pozive"
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Nastavi"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
+msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Ime Prilike"
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
+msgstr "Dana po Periodu"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -877,15 +893,6 @@ msgstr "Eksluzivno"
 msgid "The opportunity '%s' has been won."
 msgstr "Prilika '%s' je pobedila"
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-"Ako je ovo polje aktivno, omogucava ti da sakrijes prodajni tim bez "
-"uklanjanja istog."
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1085,6 +1092,14 @@ msgstr "<"
 msgid "Mobile"
 msgstr "Mobilni"
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+"Nema drugih \" Otvorenih\" ili \" Nastupajucih) Prilika za partnera '%s'."
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1121,23 +1136,16 @@ msgid "Meetings"
 msgstr "Sastanci"
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
-msgstr "Sledeca Akcija"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
+msgstr ""
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
 msgstr "Ponovljaj sve dok"
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr "Ekstra Opcije"
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1154,6 +1162,12 @@ msgstr "Krajnji Rok"
 msgid "_Cancel"
 msgstr "_Otkazi"
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1174,6 +1188,18 @@ msgstr "Statistika"
 msgid "Attendees"
 msgstr "Ucesnici"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1274,11 +1300,13 @@ msgid "Tue"
 msgstr "Tada"
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr "Nivo"
 
@@ -1287,11 +1315,6 @@ msgstr "Nivo"
 msgid "History Information"
 msgstr "Informacije Istorije"
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neispravan XML za Pregled arhitekture!"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1364,21 +1387,31 @@ msgstr "Datum Otvaranja"
 msgid "Duration in Minutes"
 msgstr "Kasnjenje u Minutima"
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr "Nastavi"
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr "Upravlja HelpDesk Servisom"
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
-msgstr "Dana po Periodu"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
+msgstr "Ime Prilike"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
-msgstr "Zatvoreni/Otkazani \\nTragoci ne mogu se konvertovati u Prilike"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
+msgstr ""
+"Ako je ovo polje aktivno, omogucava ti da sakrijes prodajni tim bez "
+"uklanjanja istog."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1473,20 +1506,26 @@ msgstr "Datum"
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr "Posebni Filteri..."
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
-msgstr "Informacije o Ucesnicima"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
+msgstr "Prilike Sumarno"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Search"
 msgstr "Pretrazi"
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1598,11 +1637,6 @@ msgstr "fonetske Kategorije"
 msgid "Invite People"
 msgstr "Pozovi Ljude"
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr "Prilike po Kategorijama"
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1634,6 +1668,16 @@ msgstr "="
 msgid "Unconfirmed"
 msgstr "Nepotvrdjeno"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1643,17 +1687,21 @@ msgstr "Nepotvrdjeno"
 msgid "Name"
 msgstr "Ime"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,alarm_id:0
 #: field:crm.meeting,base_calendar_alarm_id:0
 msgid "Alarm"
 msgstr "Alarm"
 
-#. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
-msgstr "Zakazi normalni Telefonski Sastanak"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1675,11 +1723,6 @@ msgstr ","
 msgid "Wizard"
 msgstr "Carobnjak"
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Pravila nisu podrzana za osv_memory objekata !"
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1703,6 +1746,11 @@ msgstr "Kreacija"
 msgid "High"
 msgstr "Visoki"
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr "Sekunde"
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1882,6 +1930,15 @@ msgstr "Prilike po Kategorijama"
 msgid "Customer Name"
 msgstr "Ime Klijenta"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1903,12 +1960,9 @@ msgid "Select stages for this Sales Team"
 msgstr "Izaberi nivoe za ovaj prodajni Tim"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
-"Nema drugih \" Otvorenih\" ili \" Nastupajucih) Prilika za partnera '%s'."
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
@@ -2015,10 +2069,9 @@ msgid "Weeks"
 msgstr "Nedelje"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
-msgstr "Trag "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
+msgstr "Zakazi normalni Telefonski Sastanak"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2027,9 +2080,11 @@ msgid "Error !"
 msgstr "Greska !"
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
-msgstr "Sekunde"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
+msgstr ""
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
@@ -2180,6 +2235,11 @@ msgstr "Postavi na Nepotvrdjeno"
 msgid "Note"
 msgstr "Napomena"
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2212,6 +2272,15 @@ msgstr "Plug-In(dodatak)"
 msgid "Internal Meeting"
 msgstr "Interni Sastanak"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2232,6 +2301,16 @@ msgstr "Nadolazeci"
 msgid "Customer Meeting"
 msgstr "Sastanak Korisnika"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2267,6 +2346,12 @@ msgstr "Telefon"
 msgid "Active"
 msgstr "Aktivan"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2313,6 +2398,32 @@ msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 "Ovo moze pomoci asociacijama u njihovom prikupljanju sredstava i pracenju."
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2354,6 +2465,14 @@ msgstr "Analiza Prilika"
 msgid "Misc"
 msgstr "Ostalo"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2407,13 +2526,6 @@ msgstr "Grad"
 msgid "Busy"
 msgstr "Zauzet"
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2537,11 +2649,9 @@ msgstr ""
 "intervala, poslednjih X perioda."
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
-msgstr "Poruke"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
+msgstr "Moj PObednicki/Gubitnicki proslogodisnji skor"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2591,9 +2701,9 @@ msgid "Lead To Opportunity"
 msgstr "Trag ka Prilici"
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
-msgstr "Prilike Sumarno"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
+msgstr "Informacije o Ucesnicima"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2758,15 +2868,23 @@ msgstr "Prema preporuci"
 msgid "Add Internal Note"
 msgstr "Dodaj Internu Napomenu"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr "Poslednji"
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
-msgstr "Moj PObednicki/Gubitnicki proslogodisnji skor"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
+msgstr "Poruke"
 
 #. module: crm
 #: help:crm.case.stage,on_change:0
@@ -2803,6 +2921,13 @@ msgstr "Otkazano"
 msgid "Note Body"
 msgstr "Beleska sadrzaja"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2825,6 +2950,15 @@ msgstr "   Mesec   "
 msgid "Links"
 msgstr "Veze"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2867,6 +3001,11 @@ msgstr "Pozivi Sumarno"
 msgid "Operator"
 msgstr "Rukovaoc"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Tel Poziv za Tel Poziv"
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2891,11 +3030,6 @@ msgstr ""
 "Ove adrese ce primiti kopiju ovog maila. Da za stalno modifikujete CC listu, "
 "uredi globalno CC polje ovog slucaja."
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2973,6 +3107,14 @@ msgstr "Kanal"
 msgid "Schedule Call"
 msgstr "Zakazi Poziv"
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr "Sledeca Akcija"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3239,6 +3381,11 @@ msgstr ""
 "Ove ce Email adrese bti pridodane CC polju za sve odlazne i dolazne Emailove "
 "za ovaj zapis pre nego je poslat. Razdvoj vise Email adresa zarezom"
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3336,12 +3483,6 @@ msgstr "Moras potvrditi da ovaj partner vec ne postoji."
 msgid "Delay to Open"
 msgstr "Kasnjenje do Otvaranja"
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr "Nema nivoa za Dobitnu Priliku definisanu za ovaj Prodajni Tim."
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3362,7 +3503,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr "NIje pronadjen Enmail ID za adresu Tvoje Kompanije"
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr "Prilike po NIvoima"
@@ -3407,9 +3547,9 @@ msgid "Need Consulting"
 msgstr "Potrebna Konsultacija"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Tel Poziv za Tel Poziv"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
+msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -3429,6 +3569,11 @@ msgstr "Kontakt Partnera"
 msgid "Recurrent ID date"
 msgstr "Ponovljeni ID Datum"
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3641,12 +3786,6 @@ msgstr "Opcija"
 msgid "Negotiation"
 msgstr "Pregovaranje"
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr "Zatvoreni/Otkazani Tel \\nPOzivi ne mogu se konvertovati u Prilike"
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
@@ -3700,3 +3839,49 @@ msgstr "Godina"
 #: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
 msgstr "Novine"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neispravno ime modela u definiciji akcije."
+
+#~ msgid "Cases"
+#~ msgstr "Slucajevi"
+
+#~ msgid "Extended Options..."
+#~ msgstr "Ekstra Opcije"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neispravan XML za Pregled arhitekture!"
+
+#, python-format
+#~ msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#~ msgstr "Zatvoreni/Otkazani \\nTragoci ne mogu se konvertovati u Prilike"
+
+#~ msgid "Opportunities By Categories"
+#~ msgstr "Prilike po Kategorijama"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Pravila nisu podrzana za osv_memory objekata !"
+
+#, python-format
+#~ msgid "Lead "
+#~ msgstr "Trag "
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
+
+#, python-format
+#~ msgid "There is no stage for won opportunities defined for this Sale Team."
+#~ msgstr "Nema nivoa za Dobitnu Priliku definisanu za ovaj Prodajni Tim."
+
+#, python-format
+#~ msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
+#~ msgstr "Zatvoreni/Otkazani Tel \\nPOzivi ne mogu se konvertovati u Prilike"
+
+#, python-format
+#~ msgid "is converted to Opportunity."
+#~ msgstr "je konvertovano u Priliku"
diff --git a/addons/crm/i18n/sv.po b/addons/crm/i18n/sv.po
index 5f3e1bfa38a..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-14 05:04+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/tlh.po b/addons/crm/i18n/tlh.po
index 7f8d72481f1..d57a932bd03 100644
--- a/addons/crm/i18n/tlh.po
+++ b/addons/crm/i18n/tlh.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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-10-30 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -113,11 +108,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -127,10 +117,14 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
 
 #. module: crm
@@ -150,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -262,6 +255,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -272,12 +274,6 @@ msgstr ""
 msgid "Criteria"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -319,6 +315,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -635,6 +638,11 @@ msgid ""
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -645,6 +653,13 @@ msgstr ""
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -778,7 +793,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -805,15 +819,17 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
 msgstr ""
 
 #. module: crm
@@ -848,13 +864,6 @@ msgstr ""
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1020,6 +1029,13 @@ msgstr ""
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1056,11 +1072,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
 
 #. module: crm
@@ -1068,11 +1082,6 @@ msgstr ""
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1089,6 +1098,12 @@ msgstr ""
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1109,6 +1124,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1209,11 +1236,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1222,11 +1251,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1299,20 +1323,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1406,13 +1438,14 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1420,6 +1453,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1531,11 +1569,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1567,6 +1600,16 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1577,14 +1620,18 @@ msgid "Name"
 msgstr ""
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1608,11 +1655,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1634,6 +1676,11 @@ msgstr ""
 msgid "High"
 msgstr ""
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1811,6 +1858,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1832,10 +1888,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1943,9 +1997,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1955,8 +2008,10 @@ msgid "Error !"
 msgstr ""
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2107,6 +2162,11 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2139,6 +2199,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2159,6 +2228,16 @@ msgstr ""
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2194,6 +2273,12 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2237,6 +2322,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2278,6 +2389,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2331,12 +2450,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2446,10 +2559,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2500,8 +2611,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2667,14 +2778,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2712,6 +2831,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2734,6 +2860,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2773,6 +2908,11 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2795,11 +2935,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2875,6 +3010,14 @@ msgstr ""
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3126,6 +3269,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3223,12 +3371,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3249,7 +3391,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3294,8 +3435,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3316,6 +3457,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3528,12 +3674,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
diff --git a/addons/crm/i18n/tr.po b/addons/crm/i18n/tr.po
index 573f5faeace..46a035d5079 100644
--- a/addons/crm/i18n/tr.po
+++ b/addons/crm/i18n/tr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 10: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-10-31 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Eylem tanımlamasında geçersiz model adı."
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -113,11 +108,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr "Aşama Adı"
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr "Olaylar"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -127,10 +117,14 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
 
 #. module: crm
@@ -150,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -262,6 +255,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -272,12 +274,6 @@ msgstr ""
 msgid "Criteria"
 msgstr "Ölçütler"
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -319,6 +315,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -635,6 +638,11 @@ msgid ""
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -645,6 +653,13 @@ msgstr ""
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -778,7 +793,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -805,16 +819,18 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
+msgstr "Dönemsel Günler"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -848,13 +864,6 @@ msgstr ""
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1020,6 +1029,13 @@ msgstr "<"
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1056,23 +1072,16 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
-msgstr "Sonraki Eylem"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
+msgstr ""
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1089,6 +1098,12 @@ msgstr "Bitiş tarihi"
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1109,6 +1124,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1209,11 +1236,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1222,11 +1251,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1299,20 +1323,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
-msgstr "Dönemsel Günler"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
+msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1406,13 +1438,14 @@ msgstr "Tarih"
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1420,6 +1453,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1531,11 +1569,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1567,6 +1600,16 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1577,14 +1620,18 @@ msgid "Name"
 msgstr "Adı"
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1608,11 +1655,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1634,6 +1676,11 @@ msgstr ""
 msgid "High"
 msgstr "Yüksek"
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1811,6 +1858,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1832,10 +1888,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1943,9 +1997,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1955,8 +2008,10 @@ msgid "Error !"
 msgstr "Hata !"
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2107,6 +2162,11 @@ msgstr ""
 msgid "Note"
 msgstr "Not"
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2139,6 +2199,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2159,6 +2228,16 @@ msgstr "Beklemede"
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2194,6 +2273,12 @@ msgstr ""
 msgid "Active"
 msgstr "Aktif"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2237,6 +2322,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2278,6 +2389,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2331,12 +2450,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2446,10 +2559,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2500,8 +2611,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2667,14 +2778,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2712,6 +2831,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2734,6 +2860,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2773,6 +2908,11 @@ msgstr ""
 msgid "Operator"
 msgstr "İşleç"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2795,11 +2935,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2875,6 +3010,14 @@ msgstr "Kanal"
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr "Sonraki Eylem"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3126,6 +3269,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3223,12 +3371,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3249,7 +3391,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3294,8 +3435,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3316,6 +3457,11 @@ msgstr "Cari İletişimi"
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3528,12 +3674,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
@@ -3588,6 +3728,9 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
+
 #~ msgid "Base Information"
 #~ msgstr "Temel Bilgi"
 
@@ -3600,6 +3743,9 @@ msgstr ""
 #~ msgid "this wizard will create all sub-menus, within the selected menu."
 #~ msgstr "Bu sihirbaz seçilen menü içindeki bütun alt menüleri oluşturacaktır."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Eylem tanımlamasında geçersiz model adı."
+
 #~ msgid "Remind Partner"
 #~ msgstr "Ortağa Hatırlat"
 
@@ -3689,6 +3835,9 @@ msgstr ""
 #~ msgid "Close Lead"
 #~ msgstr "Potansiyeli Kapat"
 
+#~ msgid "Cases"
+#~ msgstr "Olaylar"
+
 #~ msgid "Button Pressed"
 #~ msgstr "Düğmeye Basıldı"
 
diff --git a/addons/crm/i18n/uk.po b/addons/crm/i18n/uk.po
index 20fe4664790..65ebf885456 100644
--- a/addons/crm/i18n/uk.po
+++ b/addons/crm/i18n/uk.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-08 13:13+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@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-10-30 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -113,11 +108,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr "Випадки"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -127,13 +117,15 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
-"Категорія партнера, яку буде додано до партнерів, котрі відповідатимуть "
-"критеріям сегментації після розрахунку."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -152,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -264,6 +255,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -274,12 +274,6 @@ msgstr ""
 msgid "Criteria"
 msgstr "Критерій"
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -321,6 +315,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -639,6 +640,11 @@ msgstr ""
 "Типовий стан настрою для періоду перед розрахунком 'Макс. інтервал'. Це "
 "початковий типовий стан настрою, якщо в партнера немає подій."
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -649,6 +655,15 @@ msgstr ""
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+"Категорія партнера, яку буде додано до партнерів, котрі відповідатимуть "
+"критеріям сегментації після розрахунку."
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -782,7 +797,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -809,16 +823,18 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
+msgstr "Днів у періоді"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -852,13 +868,6 @@ msgstr "Ексклюзивний"
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1024,6 +1033,13 @@ msgstr "<"
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1060,23 +1076,16 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
-msgstr "Наступна дія"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
+msgstr ""
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1093,6 +1102,12 @@ msgstr "Термін"
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1113,6 +1128,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1213,11 +1240,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1226,11 +1255,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури Вигляду!"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1303,20 +1327,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
-msgstr "Днів у періоді"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
+msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1410,13 +1442,14 @@ msgstr "Дата"
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1424,6 +1457,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1535,11 +1573,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1571,6 +1604,16 @@ msgstr "="
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1581,14 +1624,18 @@ msgid "Name"
 msgstr "Назва"
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1612,11 +1659,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1638,6 +1680,11 @@ msgstr ""
 msgid "High"
 msgstr "Високий"
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1815,6 +1862,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1836,10 +1892,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1947,9 +2001,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1959,8 +2012,10 @@ msgid "Error !"
 msgstr ""
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2111,6 +2166,11 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2143,6 +2203,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2163,6 +2232,16 @@ msgstr "В очікуванні"
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2198,6 +2277,12 @@ msgstr ""
 msgid "Active"
 msgstr "Активний"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2241,6 +2326,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2282,6 +2393,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2335,13 +2454,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2453,10 +2565,8 @@ msgstr ""
 "останніх X періодів."
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2507,8 +2617,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2674,14 +2784,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2719,6 +2837,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2741,6 +2866,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2780,6 +2914,11 @@ msgstr ""
 msgid "Operator"
 msgstr "Оператор"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2802,11 +2941,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2882,6 +3016,14 @@ msgstr "Канал"
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr "Наступна дія"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3133,6 +3275,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3230,12 +3377,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3256,7 +3397,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3301,8 +3441,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3323,6 +3463,11 @@ msgstr "Контакт партнера"
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3535,12 +3680,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
@@ -3616,6 +3755,9 @@ msgstr ""
 #~ msgid "Add watchers (Cc)"
 #~ msgstr "Спостерігачі (Cc)"
 
+#~ msgid "Cases"
+#~ msgstr "Випадки"
+
 #~ msgid "Watchers Emails"
 #~ msgstr "Ел.адреси спостерігачів"
 
@@ -3649,6 +3791,9 @@ msgstr ""
 #~ msgid "Mail to these emails"
 #~ msgstr "Надіслати на ці ел.адреси"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильний XML для Архітектури Вигляду!"
+
 #~ msgid "My Histories"
 #~ msgstr "Мої історії"
 
@@ -3758,6 +3903,11 @@ msgstr ""
 #~ msgid "Section Code"
 #~ msgstr "Код секції"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
+
 #~ msgid "General Description"
 #~ msgstr "Загальний опис"
 
diff --git a/addons/crm/i18n/vi.po b/addons/crm/i18n/vi.po
index 4911ef949d0..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-14 05:04+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/zh_CN.po b/addons/crm/i18n/zh_CN.po
index 6c9185ed289..e8b7bbd9768 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 04:49+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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-10-30 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr "业务个案阶段"
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "在动作定义使用了无效的模快名。"
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -113,11 +108,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr "阶段名称"
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr "业务个案"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -127,11 +117,15 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
-msgstr "这业务伙伴分类将加入到符合的业务伙伴细分准则"
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
+msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -150,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -262,6 +255,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -272,12 +274,6 @@ msgstr "发送新Email"
 msgid "Criteria"
 msgstr "标准"
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -319,6 +315,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -635,6 +638,11 @@ msgid ""
 "This is the starting state of mind by default if the partner has no event."
 msgstr "前期的默认满意度以'最大间隔'计算. 如果业务伙伴没有事件这是默认的开始满意度"
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -645,6 +653,13 @@ msgstr "特征选项"
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr "这业务伙伴分类将加入到符合的业务伙伴细分准则"
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -778,7 +793,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -805,16 +819,18 @@ msgid "Search Phonecalls"
 msgstr "查询电话呼叫"
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "继续"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
+msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "商机名称"
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
+msgstr "每个期间的天数"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -848,13 +864,6 @@ msgstr "唯一的"
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1020,6 +1029,13 @@ msgstr "<"
 msgid "Mobile"
 msgstr "手机"
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1056,23 +1072,16 @@ msgid "Meetings"
 msgstr "会议"
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
-msgstr "下一动作"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
+msgstr ""
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1089,6 +1098,12 @@ msgstr "截止日期"
 msgid "_Cancel"
 msgstr "取消(_C)"
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1109,6 +1124,18 @@ msgstr ""
 msgid "Attendees"
 msgstr "与会者"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1209,11 +1236,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr "阶段"
 
@@ -1222,11 +1251,6 @@ msgstr "阶段"
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效的视图结构xml文件!"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1299,20 +1323,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr "继续"
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
-msgstr "每个期间的天数"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
+msgstr "商机名称"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1406,20 +1438,26 @@ msgstr "日期"
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
-msgstr ""
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
+msgstr "商机综述"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1531,11 +1569,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1567,6 +1600,16 @@ msgstr "="
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1576,17 +1619,21 @@ msgstr ""
 msgid "Name"
 msgstr "名称"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,alarm_id:0
 #: field:crm.meeting,base_calendar_alarm_id:0
 msgid "Alarm"
 msgstr "报警"
 
-#. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
-msgstr "安排正常会议或电话会议"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1608,11 +1655,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1634,6 +1676,11 @@ msgstr ""
 msgid "High"
 msgstr "高"
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1811,6 +1858,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1832,10 +1888,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1943,10 +1997,9 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
-msgstr ""
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
+msgstr "安排正常会议或电话会议"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1955,8 +2008,10 @@ msgid "Error !"
 msgstr "错误！"
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2107,6 +2162,11 @@ msgstr "重置为未确认"
 msgid "Note"
 msgstr "备注"
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2139,6 +2199,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr "内部会议"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2159,6 +2228,16 @@ msgstr "悬而未决"
 msgid "Customer Meeting"
 msgstr "客户会议"
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2194,6 +2273,12 @@ msgstr "电话"
 msgid "Active"
 msgstr "有效"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2237,6 +2322,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2278,6 +2389,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2331,12 +2450,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2450,10 +2563,8 @@ msgid ""
 msgstr "此计算是基于在在此期间发生的所有事件, 过去的X期间"
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2504,9 +2615,9 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
-msgstr "商机综述"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2671,14 +2782,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2716,6 +2835,13 @@ msgstr "已取消"
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2738,6 +2864,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2777,6 +2912,11 @@ msgstr "呼叫概要"
 msgid "Operator"
 msgstr "运算符"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2799,11 +2939,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2879,6 +3014,14 @@ msgstr "渠道"
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr "下一动作"
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3130,6 +3273,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3227,12 +3375,6 @@ msgstr "你可能要核实这个业务伙伴是否已不存在"
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3253,7 +3395,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr "没建立你的公司地址邮箱ID!"
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3298,8 +3439,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3320,6 +3461,11 @@ msgstr "业务伙伴联系方式"
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3532,12 +3678,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
@@ -3742,6 +3882,9 @@ msgstr "时事通信"
 #~ msgid "Planned costs"
 #~ msgstr "计划成本"
 
+#~ msgid "Cases"
+#~ msgstr "业务个案"
+
 #~ msgid "Create menu Entries"
 #~ msgstr "创建菜单"
 
@@ -3980,6 +4123,9 @@ msgstr "时事通信"
 #~ msgid "Learning And Education"
 #~ msgstr "学习和教育"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "在动作定义使用了无效的模快名。"
+
 #, python-format
 #~ msgid ""
 #~ "You can not escalate this case.\n"
@@ -4023,6 +4169,10 @@ msgstr "时事通信"
 #~ msgid "Add Last Mail for Replying"
 #~ msgstr "回复时增加最近的邮件"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+
 #~ msgid "Send Partner & Historize"
 #~ msgstr "发送到业务伙伴和记载"
 
@@ -4254,6 +4404,9 @@ msgstr "时事通信"
 #~ msgid "Lead Email"
 #~ msgstr "营销线索邮件"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效的视图结构xml文件!"
+
 #~ msgid "Closed Won"
 #~ msgstr "关闭成功"
 
diff --git a/addons/crm/i18n/zh_TW.po b/addons/crm/i18n/zh_TW.po
index b338b34c551..53a6fd8e587 100644
--- a/addons/crm/i18n/zh_TW.po
+++ b/addons/crm/i18n/zh_TW.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-01-30 13:19+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-10-30 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -113,11 +108,6 @@ msgstr ""
 msgid "Stage Name"
 msgstr ""
 
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Cases"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.lead.report,day:0
@@ -127,10 +117,14 @@ msgid "Day"
 msgstr ""
 
 #. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid ""
-"The partner category that will be added to partners that match the "
-"segmentation criterions after computation."
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
 
 #. module: crm
@@ -150,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -262,6 +255,15 @@ msgstr ""
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
@@ -272,12 +274,6 @@ msgstr ""
 msgid "Criteria"
 msgstr "准则"
 
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "is converted to Opportunity."
-msgstr ""
-
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
@@ -319,6 +315,13 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better sort the type of calls "
+"tracked in the system."
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -635,6 +638,11 @@ msgid ""
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -645,6 +653,13 @@ msgstr ""
 msgid "#Phone calls"
 msgstr ""
 
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
@@ -778,7 +793,6 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -805,16 +819,18 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their leads and sales opportunities. It will "
+"allow them to easily track how is positioned a specific lead or opportunity "
+"in the sales cycle."
 msgstr ""
 
 #. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
+msgstr "期间日编号"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -848,13 +864,6 @@ msgstr "选择性排除"
 msgid "The opportunity '%s' has been won."
 msgstr ""
 
-#. module: crm
-#: help:crm.case.section,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the sales team "
-"without removing it."
-msgstr ""
-
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
@@ -1020,6 +1029,13 @@ msgstr ""
 msgid "Mobile"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1056,11 +1072,9 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
 
 #. module: crm
@@ -1068,11 +1082,6 @@ msgstr ""
 msgid "Repeat Until"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Extended Options..."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
@@ -1089,6 +1098,12 @@ msgstr "下一日期"
 msgid "_Cancel"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
@@ -1109,6 +1124,18 @@ msgstr ""
 msgid "Attendees"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"'Leads' allows you to manage and keep track of all first potential interests "
+"of a partner in one of your products or services. A lead is a first, "
+"unqualified, contact with a prospect or customer. After being qualified, a "
+"lead can be converted into a business opportunity with the creation of the "
+"related partner for further detailed tracking of any linked activities. You "
+"can use leads when you import a database of prospects or to integrate your "
+"website's contact form with OpenERP."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
@@ -1209,11 +1236,13 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:0
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
+#, python-format
 msgid "Stage"
 msgstr ""
 
@@ -1222,11 +1251,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1299,20 +1323,28 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
 msgstr ""
 
 #. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Periode"
-msgstr "期间日编号"
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
+msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 msgstr ""
 
 #. module: crm
@@ -1406,13 +1438,14 @@ msgstr "日期"
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
+#: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
 msgstr ""
 
 #. module: crm
@@ -1420,6 +1453,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1531,11 +1569,6 @@ msgstr ""
 msgid "Invite People"
 msgstr ""
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr ""
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1567,6 +1600,16 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.categ,name:0
 #: field:crm.installer,name:0
@@ -1577,14 +1620,18 @@ msgid "Name"
 msgstr "分割名称"
 
 #. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form for the traceability of every "
+"contact you get with a partner. From the call record, you can trigger a "
+"request for another call, a meeting or a business opportunity."
 msgstr ""
 
 #. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
 
 #. module: crm
@@ -1608,11 +1655,6 @@ msgstr ""
 msgid "Wizard"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1634,6 +1676,11 @@ msgstr ""
 msgid "High"
 msgstr ""
 
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1811,6 +1858,15 @@ msgstr ""
 msgid "Customer Name"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
@@ -1832,10 +1888,8 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
 
 #. module: crm
@@ -1943,9 +1997,8 @@ msgid "Weeks"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Lead "
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
@@ -1955,8 +2008,10 @@ msgid "Error !"
 msgstr ""
 
 #. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
 msgstr ""
 
 #. module: crm
@@ -2107,6 +2162,11 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2139,6 +2199,15 @@ msgstr ""
 msgid "Internal Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's  activities in order to "
+"better classify and analyse them after they have been maintained in your "
+"leads and opportunities. You can use categories to reflect your product "
+"structure or the different types of sales you do."
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: selection:crm.add.note,state:0
@@ -2159,6 +2228,16 @@ msgstr ""
 msgid "Customer Meeting"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Sales team allows you to organize your different salesmen or departments "
+"into separate teams. Each team will work in his own list of opportunities, "
+"sales orders, eso. Each user can set a team by default in his preferences. "
+"The opportunities and sales order he will see, will be automatically "
+"filtered according to his team."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2194,6 +2273,12 @@ msgstr ""
 msgid "Active"
 msgstr "活动的"
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
@@ -2237,6 +2322,32 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"Opportunities allows you to manage and keep track of your sales pipeline by "
+"creating specific customer or prospect related sales documents in order to "
+"follow up potential sales. Information such as the expected revenue, "
+"opportunity stage, expected closing date, communication history and so on "
+"can be maintained in them. Opportunities can be connected with the email "
+"gateway: new emails create opportunities, each of them automatically gets "
+"the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls lists all the calls to be performed by your sales team. They "
+"can record the information about the call on the form view. These "
+"information will appear on the partner form for the traceability of every "
+"contact you get with a customer. You can import a .CSV file with a list of "
+"calls to be done for your sales team."
+msgstr ""
+
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2278,6 +2389,14 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories that you will then be able to assign to "
+"your partners to better manage your interactions with them. The segmentation "
+"tool will assign categories to partners based on defined criteria."
+msgstr ""
+
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2331,12 +2450,6 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2446,10 +2559,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
 #. module: crm
@@ -2500,8 +2611,8 @@ msgid "Lead To Opportunity"
 msgstr ""
 
 #. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
 msgstr ""
 
 #. module: crm
@@ -2667,14 +2778,22 @@ msgstr ""
 msgid "Add Internal Note"
 msgstr ""
 
+#. module: crm
+#: code:addons/crm/crm_lead.py:0
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: crm
@@ -2712,6 +2831,13 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"'Meeting Invitations' allows you to create and manage the meeting "
+"invitations sent/to be sent to your colleagues/partners."
+msgstr ""
+
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2734,6 +2860,15 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
@@ -2773,6 +2908,11 @@ msgstr ""
 msgid "Operator"
 msgstr "操作者"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -2795,11 +2935,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -2875,6 +3010,14 @@ msgstr "销售渠道"
 msgid "Schedule Call"
 msgstr ""
 
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
@@ -3126,6 +3269,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3223,12 +3371,6 @@ msgstr ""
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3249,7 +3391,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr ""
@@ -3294,8 +3435,8 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3316,6 +3457,11 @@ msgstr ""
 msgid "Recurrent ID date"
 msgstr ""
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3528,12 +3674,6 @@ msgstr ""
 msgid "Negotiation"
 msgstr ""
 
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
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/scripts/php/countrylist.php b/addons/crm/scripts/php/countrylist.php
index 857bda4fa9b..478947623c6 100644
--- a/addons/crm/scripts/php/countrylist.php
+++ b/addons/crm/scripts/php/countrylist.php
@@ -1,103 +1,105 @@
 <?php
-	include("xmlrpc.inc");
-	
-	$user = "";
-	$password = "";
-	$db = "";
-	$serverUri = "";
-	
-	$client = new xmlrpc_client($serverUri.'common');
-	
-	$msg = new xmlrpcmsg('login');
-	$msg->addParam(new xmlrpcval($db, "string"));
-	$msg->addParam(new xmlrpcval($user, "string"));
-	$msg->addParam(new xmlrpcval($pass, "string"));
+    include("xmlrpc.inc");
+    
+    //Change to fit your configuration
+    $user = "admin";
+    $password = "a";
+    $db = "db_1";
+    $serverUri = "http://localhost:8069/xmlrpc/";
+    
+    
+    $client = new xmlrpc_client($serverUri.'common');
+    
+    $msg = new xmlrpcmsg('login');
+    $msg->addParam(new xmlrpcval($db, "string"));
+    $msg->addParam(new xmlrpcval($user, "string"));
+    $msg->addParam(new xmlrpcval($password, "string"));
 
 
-	$res =  &$client->send($msg);
+    $res =  &$client->send($msg);
 
-	if(!$res->faultCode()){
-		
-		$id = $res->value()->scalarval();	
+    if(!$res->faultCode()){
+        
+        $id = $res->value()->scalarval();   
 
-		$client = new xmlrpc_client($serverUri.'object');
+        $client = new xmlrpc_client($serverUri.'object');
 
-		$key = array(new xmlrpcval(array(new xmlrpcval("id", "string"),
-					new xmlrpcval(">", "string"),
-					new xmlrpcval(0, "int")),"array"),);
-					
-		
-				
-		$msg = new xmlrpcmsg('execute');
-		$msg->addParam(new xmlrpcval($db, "string"));
-		$msg->addParam(new xmlrpcval($id, "int"));
-		$msg->addParam(new xmlrpcval($pass, "string"));
-		$msg->addParam(new xmlrpcval("res.country","string"));
-		$msg->addParam(new xmlrpcval("search", "string"));		
-		$msg->addParam(new xmlrpcval($key, "array"));
-		$msg->addParam(new xmlrpcval(0, "int"));
-		$msg->addParam(new xmlrpcval(0, "int"));
-		$msg->addParam(new xmlrpcval("id ASC", "string"));
-		
-		$res = &$client->send($msg);
+        $key = array(new xmlrpcval(array(new xmlrpcval("id", "string"),
+                    new xmlrpcval(">", "string"),
+                    new xmlrpcval(0, "int")),"array"),);
+                    
+        
+                
+        $msg = new xmlrpcmsg('execute');
+        $msg->addParam(new xmlrpcval($db, "string"));
+        $msg->addParam(new xmlrpcval($id, "int"));
+        $msg->addParam(new xmlrpcval($password, "string"));
+        $msg->addParam(new xmlrpcval("res.country","string"));
+        $msg->addParam(new xmlrpcval("search", "string"));      
+        $msg->addParam(new xmlrpcval($key, "array"));
+        $msg->addParam(new xmlrpcval(0, "int"));
+        $msg->addParam(new xmlrpcval(0, "int"));
+        $msg->addParam(new xmlrpcval("id ASC", "string"));
+        
+        $res = &$client->send($msg);
 
-		if(!$res->faultCode())
-		{
-			$val = $res->value()->scalarval();
-			
-			$ides = array();
-			
-			for ($i=0 ; $i<count($val); $i++)
-			{
-				array_push($ides, new xmlrpcval($val[$i]->scalarval(), "int"));
-			}
-			
-			$client = new xmlrpc_client($serverUri.'object');
-			
-			$fields = array(new xmlrpcval("code", "string"), new xmlrpcval("name", "string"));
-			
-			$msg = new xmlrpcmsg('execute');
-			$msg->addParam(new xmlrpcval($db, "string"));
-			$msg->addParam(new xmlrpcval($id, "int"));
-			$msg->addParam(new xmlrpcval($pass, "string"));
-			$msg->addParam(new xmlrpcval("res.country","string"));
-			$msg->addParam(new xmlrpcval("read", "string"));
-			$msg->addParam(new xmlrpcval($ides, "array"));
-			$msg->addParam(new xmlrpcval($fields, "array"));
+        if(!$res->faultCode())
+        {
+            $val = $res->value()->scalarval();
+            
+            $ides = array();
+            
+            for ($i=0 ; $i<count($val); $i++)
+            {
+                array_push($ides, new xmlrpcval($val[$i]->scalarval(), "int"));
+            }
+            
+            $client = new xmlrpc_client($serverUri.'object');
+            
+            $fields = array(new xmlrpcval("code", "string"), new xmlrpcval("name", "string"));
+            
+            $msg = new xmlrpcmsg('execute');
+            $msg->addParam(new xmlrpcval($db, "string"));
+            $msg->addParam(new xmlrpcval($id, "int"));
+            $msg->addParam(new xmlrpcval($password, "string"));
+            $msg->addParam(new xmlrpcval("res.country","string"));
+            $msg->addParam(new xmlrpcval("read", "string"));
+            $msg->addParam(new xmlrpcval($ides, "array"));
+            $msg->addParam(new xmlrpcval($fields, "array"));
 
-			$res = &$client->send($msg);
-			
-			if (!$res->faultCode())
-			{
-				$val = $res->value()->scalarval();
-				
-				$select ='<select class="inputbox required"  name="country" id="country" >									
-							<option value="" selected="selected"> -- Select an Option -- </option>';
+            $res = &$client->send($msg);
+            
+            if (!$res->faultCode())
+            {
+                $val = $res->value()->scalarval();
+                
+                $select ='<select class="inputbox required"  name="country" id="country" >                                  
+                            <option value="" selected="selected"> -- Select an Option -- </option>';
+
+                for ($i=0; $i<count($val);$i++)
+                {
+                    $field = $val[$i]->scalarval();
+                    $select .= '<option value="'.$field['code']->scalarval().'">'.$field['name']->scalarval().'</option>';
+                }
+                
+                $select .= '</select>';
+                
+                echo $select;
+            }
+            else
+            {
+                echo "Country not getting";
+            }
+        }
+        else
+        {
+            echo "Country list id empty";
+        }       
+    }
+    else
+    {
+        echo "connection not establish";
+    }
 
-				for ($i=0; $i<count($val);$i++)
-				{
-					$field = $val[$i]->scalarval();
-					$select .= '<option value="'.$field['code']->scalarval().'">'.$field['name']->scalarval().'</option>';
-				}
-				
-				$select .= '</select>';
-				
-				echo $select;
-			}
-			else
-			{
-				echo "Country not getting";
-			}
-		}
-		else
-		{
-			echo "Country list id empty";
-		}		
-	}
-	else
-	{
-		echo "connection not establish";
-	}
 
-	exit;
 ?>
diff --git a/addons/crm/scripts/php/crmlead.php b/addons/crm/scripts/php/crmlead.php
index 91cfe7649ed..12c43085a14 100644
--- a/addons/crm/scripts/php/crmlead.php
+++ b/addons/crm/scripts/php/crmlead.php
@@ -1,201 +1,155 @@
 <?php
 
-	include("xmlrpc.inc");		
+    include("xmlrpc.inc");      
 
 class Contact
 {
-	private $subject = '', $to = '';
-	
-	function __construct($to, $sub)
-	{
-		$this->to = $to;
-		$this->subject = $sub;
-	}
-		
-	function mailTo($post)
-	{	
-		if (!empty($post))
-		{
-				
-			if (empty($this->to))
-			{
-				$this->to = 'sales@tinyerp.com';
-			}
-			
-			if (empty($this->subject))
-			{
-				$this->subject = 'Contact form information';
-			}
+    private $subject = '', $to = '';
+    
+    function __construct($to, $sub)
+    {
+        $this->to = $to;
+        $this->subject = $sub;
+    }
+        
 
-			$body = '<table width="90%" border="0" cellspacing="2" cellpadding="2">
-						<tr>
-								<td width="25%"></td>
-								<td width="2%"></td>
-								<td></td>
-						</tr>';
-						
-			foreach ($post as $key => $value)
-			{
-				$body .=	"<tr>
-									<td align='right'>$key</td>
-									<td align='center'><b>:</b></td>
-									<td align='left'>$value</td>
-							</tr>";
-			}
-
-			$body .= '</table>';
-			
-			$header = 'MEME-version : 1.0'."\r\n";
-			$header .= 'Content-type: text/html; charset=iso-8859-1'."\r\n";
-			$header .= 'From: '.$post['name'].' <'.$post['email'].'>'."\r\n";
-			$header .= 'Reply-To: '.$post['name'].' <'.$post['email'].'>'."\r\n";
-			$header .= 'Return-Path: '.$post['name'].' <'.$post['email'].'>'."\r\n";
-			
-			if (mail($this->to, $this->subject, $body, $header))
-			{
-				echo "<br /><h3>Thank You, Your information has been successfully submitted.</h3><br /><p><b>We will be in touch very soon.</b></p>";
-				
-			}
-			else
-			{
-				echo "<br /><h4>Sorry, Due to some problem Your information has not been submitted.</h4>";
-			}
-			
-		}
-	}
-	
-	function xmlCallTo($usr, $password, $database, $server, $post)
-	{
-		$user = $usr;
-		$pass = $password;
-		$db = $database;
-		$server_url = $server; //'http://localhost:8069/xmlrpc/'
-		
-		$client = new xmlrpc_client($server_url.'common');
-		
-		$msg = new xmlrpcmsg('login');
-		$msg->addParam(new xmlrpcval($db, "string"));
-		$msg->addParam(new xmlrpcval($user, "string"));
-		$msg->addParam(new xmlrpcval($pass, "string"));
+    function xmlCallTo($usr, $password, $database, $server, $post)
+    {
+        $user = $usr;
+        $pass = $password;
+        $db = $database;
+        $server_url = $server; //'http://localhost:8069/xmlrpc/'
+        
+        $client = new xmlrpc_client($server_url.'common');
+        
+        $msg = new xmlrpcmsg('login');
+        $msg->addParam(new xmlrpcval($db, "string"));
+        $msg->addParam(new xmlrpcval($user, "string"));
+        $msg->addParam(new xmlrpcval($pass, "string"));
 
 
-		$res =  &$client->send($msg);
-		
-		if(!$res->faultCode()){
-			
-			$val = $res->value();	
-			$id = $val->scalarval();
+        $res =  &$client->send($msg);
+        
+        if(!$res->faultCode()){
+            
+            $val = $res->value();   
+            $id = $val->scalarval();
 
-			if (empty($id)){
-				
-				echo "Connection error = ";
-				exit;
-			}
-			else
-			{
-				$client2 = new xmlrpc_client($server_url.'object');
+            if (empty($id)){
+                
+                echo "Connection error = ";
+                exit;
+            }
+            else
+            {
+                $client2 = new xmlrpc_client($server_url.'object');
+                $key = array(new xmlrpcval(array(new xmlrpcval("code", "string"), new xmlrpcval("=", "string"), new xmlrpcval($post['country'], "string")),"array"),);
+                $msg = new xmlrpcmsg('execute');
+                $msg->addParam(new xmlrpcval($db, "string"));
+                $msg->addParam(new xmlrpcval($id, "int"));
+                $msg->addParam(new xmlrpcval($pass, "string"));
+                $msg->addParam(new xmlrpcval("res.country","string"));
+                $msg->addParam(new xmlrpcval("search", "string"));
+                $msg->addParam(new xmlrpcval($key, "array"));
+                $msg->addParam(new xmlrpcval(0, "int"));
+                $msg->addParam(new xmlrpcval(1, "int"));
+                
+                $res = &$client2->send($msg);
+                
+                $val = $res->value()->scalarval();
+                
+                $countryId = $val[0]->scalarval();
+                
+                $val = array ("name" => new xmlrpcval($post['company'],"string"),
+                              "email_from" => new xmlrpcval($post['email'], "string"),
+                              "phone" => new xmlrpcval($post['phone'], "string"),
+                              "partner_name" => new xmlrpcval($post['name'], "string"),
+                              "function" => new xmlrpcval($post["jobtitle"], "string"),
+                              "zip" => new xmlrpcval($post['zip'], "string"),
+                              "stage_id" => new xmlrpcval(2, "int"),
+                              "city" => new xmlrpcval($post['city'], "string"),
+                              "country_id" => new xmlrpcval($countryId, "int"),
+                              "state" => new xmlrpcval("draft", "string"),
+                              "user_id" => new xmlrpcval(false, "boolean"),
+                              "description" => new xmlrpcval("No.of Employees: ".$post['employees']."\nState: ".$post['state']."\nIndustry: ".$post['industry']."\nAbout: ".$post['about'], "string")
+                            );
+                                                
+                $msg = new xmlrpcmsg('execute');
+                $msg->addParam(new xmlrpcval($db, "string"));
+                $msg->addParam(new xmlrpcval($id, "int"));
+                $msg->addParam(new xmlrpcval($pass, "string"));
+                $msg->addParam(new xmlrpcval("crm.lead", "string"));
+                $msg->addParam(new xmlrpcval("create", "string"));
+                $msg->addParam(new xmlrpcval($val, "struct"));
+                                
+                
+                $res2 = &$client2->send($msg);
+                
+                if(!$res2->faultCode())
+                {
+                    $readVal = $res2->value()->scalarval();
+                    
+                    if (!empty($readVal))
+                    {
+                        $val = array ( "description" => new xmlrpcval("About: ".$post['about']),
+                                "model_id" => new xmlrpcval(276, "int"),
+                                "res_id" => new xmlrpcval($readVal,"int"),
+                                "email_from" => new xmlrpcval($post['email'], "string"),
+                                "email_to" => new xmlrpcval("sales@openerp.com", "string")
+                                );
 
-				$key = array(new xmlrpcval(array(new xmlrpcval("code", "string"), new xmlrpcval("=", "string"), new xmlrpcval($post['country'], "string")),"array"),);
-				$msg = new xmlrpcmsg('execute');
-				$msg->addParam(new xmlrpcval($db, "string"));
-				$msg->addParam(new xmlrpcval($id, "int"));
-				$msg->addParam(new xmlrpcval($pass, "string"));
-				$msg->addParam(new xmlrpcval("res.country","string"));
-				$msg->addParam(new xmlrpcval("search", "string"));
-				$msg->addParam(new xmlrpcval($key, "array"));
-				$msg->addParam(new xmlrpcval(0, "int"));
-				$msg->addParam(new xmlrpcval(1, "int"));
-				
-				$res = &$client2->send($msg);
-				
-				$val = $res->value()->scalarval();
-				
-				$countryId = $val[0]->scalarval();
-				
-				$val = array ("name" => new xmlrpcval($post['company'],"string"),
-							  "title" => new xmlrpcval($post['salutation'], "string"),
-							  "email_from" => new xmlrpcval($post['email'], "string"),
-							  "phone" => new xmlrpcval($post['phone'], "string"),
-							  "partner_name" => new xmlrpcval($post['name'], "string"),
-							  "function" => new xmlrpcval($post["jobtitle"], "string"),
-							  "zip" => new xmlrpcval($post['zip'], "string"),
-							  "stage_id" => new xmlrpcval(6, "int"),
-							  "city" => new xmlrpcval($post['city'], "string"),
-							  "country_id" => new xmlrpcval($countryId, "int"),
-							  "state" => new xmlrpcval("draft", "string"),
-							  "user_id" => new xmlrpcval(false, "boolean"),
-							  "description" => new xmlrpcval("No.of Employees: ".$post['employees']."\nState: ".$post['state']."\nIndustry: ".$post['industry']."\nReasons: ".$post['reasons']."\nAbout: ".$post['about']."\nQuestions: ".stripslashes($post['questions'])."\nUpdate: ".$post['update'], "string")
-							);
-												
-				$msg = new xmlrpcmsg('execute');
-				$msg->addParam(new xmlrpcval($db, "string"));
-				$msg->addParam(new xmlrpcval($id, "int"));
-				$msg->addParam(new xmlrpcval($pass, "string"));
-				$msg->addParam(new xmlrpcval("crm.lead", "string"));
-				$msg->addParam(new xmlrpcval("create", "string"));
-				$msg->addParam(new xmlrpcval($val, "struct"));
-								
-				
-				$res2 = &$client2->send($msg);
-				
-				if(!$res2->faultCode())
-				{
-					$readVal = $res2->value()->scalarval();
-					
-					if (!empty($readVal))
-					{
-						$val = array ( "description" => new xmlrpcval("About: ".$post['about']."\nQuestions: ".$post['questions']),
-								"model_id" => new xmlrpcval(276, "int"),
-								"res_id" => new xmlrpcval($readVal,"int"),
-								"email_from" => new xmlrpcval($post['email'], "string"),
-								"email_to" => new xmlrpcval("sales@openerp.com", "string")
-								);
+                        
+                        $msg = new xmlrpcmsg('execute');
+                        $msg->addParam(new xmlrpcval($db, "string"));
+                        $msg->addParam(new xmlrpcval($id, "int"));
+                        $msg->addParam(new xmlrpcval($pass, "string"));
+                        $msg->addParam(new xmlrpcval("crm.case.history", "string"));
+                        $msg->addParam(new xmlrpcval("create", "string"));
+                        $msg->addParam(new xmlrpcval($val, "struct"));
+                        
+                        $res2 = &$client2->send($msg);
 
-						
-						$msg = new xmlrpcmsg('execute');
-						$msg->addParam(new xmlrpcval($db, "string"));
-						$msg->addParam(new xmlrpcval($id, "int"));
-						$msg->addParam(new xmlrpcval($pass, "string"));
-						$msg->addParam(new xmlrpcval("crm.case.history", "string"));
-						$msg->addParam(new xmlrpcval("create", "string"));
-						$msg->addParam(new xmlrpcval($val, "struct"));
-						
-						$res2 = &$client2->send($msg);
-
-						//echo "<br />Successfully created lead";
-						echo "<br /><h3>Thank You for your interest in openerp, we'll respond to your request shortly.</h3><br />";
-						if(strstr($post["about"],"Book")) {
-							echo '<script>window.location="http://www.openerp.com/index.php?option=com_content&amp;id=54"</script>';
-						}
-					}
-					else
-					{
-						echo "<br />Lead is not created";
-					}
-				}
-				else
-				{
-					echo "<br />Problem in message sending for create lead";
-				}
-			}			
-		}
-		else
-		{
-			echo "<br />Connection not established";
-		}
-	}
+                        //echo "<br />Successfully created lead";
+                        echo "<br /><h3>Thank You for your interest in openerp, we'll respond to your request shortly.</h3><br />";
+                        if(strstr($post["about"],"Book")) {
+                            echo '<script>window.location="http://www.openerp.com/index.php?option=com_content&amp;id=54"</script>';
+                        }
+                    }
+                    else
+                    {
+                        echo "<br />Lead is not created";
+                    }
+                }
+                else
+                {
+                    echo "<br />Problem in message sending for create lead";
+                }
+            }           
+        }
+        else
+        {
+            echo "<br />Connection not established";
+        }
+    }
 }
 
-	$arrData = array();
-	$arrData = array_merge($arrData, (array)$_POST);
-	
-	$cnt = new Contact('sales5@openerp.com', 'Country: '.$arrData['country']. ' About: ' .$arrData['about']);
-	
-	/* This function use for sending mail on perticular mail account */
-	/*$cnt->mailTo($arrData); */
-	
-	/* This function use ceating lead in crm of opener erp database */
-	$cnt->xmlCallTo('<username>', '<password>', '<db>', '<server>', $arrData);
-	
-	exit;
+    if(isset($_POST['country']) && $_POST['country'] != '') {
+        $arrData = array();
+        $arrData = array_merge($arrData, (array)$_POST);
+        
+        $cnt = new Contact('sales5@openerp.com', 'Country: '.$arrData['country']. ' About: ' .$arrData['about']);
+        
+        /* This function use for sending mail on perticular mail account */
+        /*$cnt->mailTo($arrData); */
+        
+        /* This function use ceating lead in crm of opener erp database */
+        //Change to fit your configuration
+        $cnt->xmlCallTo('admin', 'a', 'db_1', 'http://localhost:8069/xmlrpc/', $arrData);
+    }
+    else {
+        echo 'please fill the form at <a href="form.php">form.php</a>';
+    }
+    
+    exit;
 ?>
+
diff --git a/addons/crm/scripts/php/form.php b/addons/crm/scripts/php/form.php
new file mode 100644
index 00000000000..2d255e87cb3
--- /dev/null
+++ b/addons/crm/scripts/php/form.php
@@ -0,0 +1,74 @@
+<html>
+<head>
+<title>Contact form</title>
+</head>
+<body>
+    <h4>Contact Form</h4>
+    <form method="post" action="crmlead.php">
+        <label for="firstname">Firstname</label>
+            <input type="text" name="name" value="" id="firstname" class="required text" title="Please, fill in your firstname" data-required="true"><br />
+        <label for="company">Company</label>
+            <input type="text" name="company" value="" id="company" class="required text" title="Please, fill in your company name" data-required="true"><br />
+        <label for="jobtitle">Jobtitle</label>
+            <input type="text" name="jobtitle" value="" id="jobtitle" class="required text" title="Please, fill in your job title" data-required="true"><br />
+        <label for="email">Email</label>
+            <input type="text" name="email" value="" id="email" class="required email text" title="Please, enter a valid email address" data-required="true"><br />
+        <label for="phone">Phone</label>
+            <input type="text" name="phone" value="" id="phone" class="required phone text" title="Please use international format (eg: +32...)" data-required="true">
+            
+        <label for="city">City</label>
+            <input type="text" name="city" value="" id="city" class="required text" title="Please, fill in your city" data-required="true"><br />
+        <label for="zip">Zipcode</label>
+            <td><input type="text" name="zip" value="" id="zip" class="required text" title="Please, fill in your zipcode" data-required="true"><br />
+        <label for="state">State</label><input type="text" name="state" value="" id="state" class="text" title="Please, fill in your state"> <br />
+        <label> Country : <?php include('countrylist.php'); ?></label> <br />
+        <label for="employees">No.of employees</label>
+        
+                <select class="required" name="employees" title="Please, select the No. of employees" data-required="true">
+                    <option value=""> -- select an option -- </option>
+                    <option value="1-5">1-5</option>
+                    <option value="5-10">5-10</option>
+                    <option value="10-20">10-20</option>
+
+                    <option value="20-100">20-100</option>
+                    <option value="100-500">100-500</option>
+                    <option value="500+">500+</option>
+                </select><br />
+                
+              <label for="industry">Industry expertise</label>
+                <select class="required select" name="industry" title="Please, select an industry" data-required="true">
+                    <option value=""> -- select an option -- </option>
+                    <option value="auction">Auction Houses</option>
+                    <option value="bank">Bank</option>
+                    <option value="distribution">Distribution</option>
+                    <option value="education">Education</option>
+
+                    <option value="entertainment">Entertainment</option>
+                    <option value="erp_integrator">ERP Integrator</option>
+                    <option value="food_industries">Food industries</option>
+                    <option value="hotels_restaurants">Hotels &amp; restaurants</option>
+                    <option value="insurance">Insurance</option>
+                    <option value="manufacturing">Manufacturing</option>
+                    <option value="non_profit">Non-Profit</option>
+                    <option value="public">Public</option>
+
+                    <option value="services">Services</option>
+                    <option value="telecommunication">Telecommunication</option>
+                    <option value="others">Others</option>
+                </select><br />
+        <p>
+            <label> About : <textarea name="about"></textarea></textarea></label>
+        </p>
+        <p>
+            <input type="submit" value="Send"/> <input type="reset" />
+        </p>
+    </form>
+
+</body>
+</html>
+
+
+
+       
+        
+        
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 734d79a2c9e..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-14 05:36+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_claim/i18n/el.po b/addons/crm_claim/i18n/el.po
index 5ca443d3fec..11ff8f0fc23 100644
--- a/addons/crm_claim/i18n/el.po
+++ b/addons/crm_claim/i18n/el.po
@@ -7,21 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-19 07:50+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-11-20 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: crm_claim
-#: field:crm.claim,planned_revenue:0
-msgid "Planned Revenue"
-msgstr "Προβλεπόμενα Έσοδα"
-
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
 msgid "# of Cases"
@@ -34,9 +29,14 @@ msgid "Group By..."
 msgstr "Ομαδοποίηση Κατά..."
 
 #. module: crm_claim
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
+#: view:crm.claim:0
+msgid "Responsibilities"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,date_action_next:0
+msgid "Next Action Date"
+msgstr ""
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -48,6 +48,11 @@ msgstr "Μάρτιος"
 msgid "Delay to close"
 msgstr "Καθηστέρηση για κλείσιμο"
 
+#. module: crm_claim
+#: field:crm.claim,resolution:0
+msgid "Resolution"
+msgstr ""
+
 #. module: crm_claim
 #: field:crm.claim,company_id:0
 #: view:crm.claim.report:0
@@ -98,9 +103,9 @@ msgid ""
 msgstr ""
 
 #. module: crm_claim
-#: field:crm.claim,partner_mobile:0
-msgid "Mobile"
-msgstr "Κινητό"
+#: view:crm.claim:0
+msgid "Claim Description"
+msgstr ""
 
 #. module: crm_claim
 #: field:crm.claim,message_ids:0
@@ -123,11 +128,6 @@ msgstr "Ακυρώθηκε"
 msgid "Preventive"
 msgstr "Προληπτικά"
 
-#. module: crm_claim
-#: model:crm.case.stage,name:crm_claim.stage_claim2
-msgid "Fixed"
-msgstr "Σταθερό"
-
 #. module: crm_claim
 #: field:crm.claim,partner_address_id:0
 msgid "Partner Contact"
@@ -149,7 +149,7 @@ msgid "Reference"
 msgstr "Αναφορά"
 
 #. module: crm_claim
-#: field:crm.claim,date_action_next:0
+#: field:crm.claim,action_next:0
 msgid "Next Action"
 msgstr "Επόμενη Ενέργεια"
 
@@ -160,8 +160,10 @@ msgstr "Επαναφορά σε Πρόχειρο"
 
 #. module: crm_claim
 #: view:crm.claim:0
-msgid "Extra Info"
-msgstr "Επιπλέον Πληροφορίες"
+#: field:crm.claim,date_deadline:0
+#: field:crm.claim.report,date_deadline:0
+msgid "Deadline"
+msgstr "Προθεσμεία"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -171,33 +173,26 @@ msgstr "Επιπλέον Πληροφορίες"
 msgid "Partner"
 msgstr "Συνεργάτης"
 
-#. module: crm_claim
-#: field:crm.claim,active:0
-msgid "Active"
-msgstr "Ενεργή"
-
 #. module: crm_claim
 #: selection:crm.claim,type_action:0
 #: selection:crm.claim.report,type_action:0
 msgid "Preventive Action"
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim,date_closed:0
-#: selection:crm.claim,state:0
-#: selection:crm.claim.report,state:0
-msgid "Closed"
-msgstr "Έκλεισε"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
 msgstr "Τομέας"
 
 #. module: crm_claim
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Μη έγκυρο  ΧML για Προβολή Αρχιτεκτονικής!"
+#: view:crm.claim:0
+msgid "Root Causes"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,user_fault:0
+msgid "Trouble Responsible"
+msgstr ""
 
 #. module: crm_claim
 #: field:crm.claim,priority:0
@@ -206,11 +201,6 @@ msgstr "Μη έγκυρο  ΧML για Προβολή Αρχιτεκτονική
 msgid "Priority"
 msgstr "Προτεραιότητα"
 
-#. module: crm_claim
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Send New Email"
@@ -232,11 +222,6 @@ msgstr "Τύπος"
 msgid "Email"
 msgstr "Email"
 
-#. module: crm_claim
-#: field:crm.claim,canal_id:0
-msgid "Channel"
-msgstr "Κανάλι"
-
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
@@ -248,6 +233,11 @@ msgstr "Χαμυλότερο"
 msgid "Creation Date"
 msgstr "Ημερομηνία Δημιουργίας"
 
+#. module: crm_claim
+#: field:crm.claim,name:0
+msgid "Claim Subject"
+msgstr ""
+
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
 msgid ""
@@ -255,13 +245,6 @@ msgid ""
 "them with specific criteria."
 msgstr ""
 
-#. module: crm_claim
-#: view:crm.claim:0
-#: field:crm.claim,date_deadline:0
-#: field:crm.claim.report,date_deadline:0
-msgid "Deadline"
-msgstr "Προθεσμεία"
-
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "July"
@@ -326,16 +309,6 @@ msgstr "Αριθμός Ημερών για κλείσιμο της υπόθεσ
 msgid "CRM Claim Report"
 msgstr ""
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "References"
-msgstr "Αναφορές"
-
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Status and Categorization"
-msgstr "Κατάσταση και Κατηγοριοποίηση"
-
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim1
 msgid "Accepted as Claim"
@@ -352,9 +325,9 @@ msgid "September"
 msgstr "Σπτέμβριος"
 
 #. module: crm_claim
-#: view:crm.claim:0
-msgid "Communication"
-msgstr "Επικοινωνία"
+#: selection:crm.claim.report,month:0
+msgid "December"
+msgstr "Δεκέμβριος"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -378,11 +351,6 @@ msgstr "Ημερομηνία Ενημέρωσης"
 msgid "Salesman"
 msgstr "Πωλητής"
 
-#. module: crm_claim
-#: field:crm.claim,ref2:0
-msgid "Reference 2"
-msgstr "Παραπομπή 2"
-
 #. module: crm_claim
 #: field:crm.claim,categ_id:0
 #: view:crm.claim.report:0
@@ -400,16 +368,6 @@ msgstr ""
 msgid "  Year  "
 msgstr "  Έτος  "
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Closure Date"
-msgstr "Ημερομηνία Κλεισίματος"
-
-#. module: crm_claim
-#: field:crm.claim,planned_cost:0
-msgid "Planned Costs"
-msgstr "Προγραμματισμένο Κόστος"
-
 #. module: crm_claim
 #: help:crm.claim,email_cc:0
 msgid ""
@@ -432,9 +390,11 @@ msgid "Low"
 msgstr "Χαμηλό"
 
 #. module: crm_claim
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Λάθος ! Δεν μπορείτε να δημιουργήσετε κενό Μενού"
+#: field:crm.claim,date_closed:0
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Closed"
+msgstr "Έκλεισε"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -480,11 +440,6 @@ msgstr "Τηλέφωνο"
 msgid "User"
 msgstr "Χρήστης"
 
-#. module: crm_claim
-#: model:crm.case.stage,name:crm_claim.stage_claim5
-msgid "Awaiting Response"
-msgstr "Σε αναμονή Ανταπόκρισης"
-
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
 msgid "Claim Categories"
@@ -522,6 +477,7 @@ msgstr "Ιανουάριος"
 
 #. module: crm_claim
 #: view:crm.claim:0
+#: field:crm.claim,date:0
 msgid "Claim Date"
 msgstr ""
 
@@ -530,11 +486,6 @@ msgstr ""
 msgid "These people will receive email."
 msgstr "Οι παρακάτω θα λάβουνε το email"
 
-#. module: crm_claim
-#: field:crm.claim,date:0
-msgid "Date"
-msgstr "Ημερομηνία"
-
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
@@ -588,11 +539,6 @@ msgstr ""
 msgid "State"
 msgstr "Κατάσταση"
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Claim Info"
-msgstr "Πληρ. Απαίτησης"
-
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
@@ -600,9 +546,9 @@ msgid "Done"
 msgstr "Ολοκληρώθηκε"
 
 #. module: crm_claim
-#: selection:crm.claim.report,month:0
-msgid "December"
-msgstr "Δεκέμβριος"
+#: view:crm.claim:0
+msgid "Claim Reporter"
+msgstr ""
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -623,35 +569,17 @@ msgstr "Κλείσιμο"
 msgid "Open"
 msgstr "Ανοιχτή"
 
-#. module: crm_claim
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "In Progress"
 msgstr "Σε Εξέλιξη"
 
-#. module: crm_claim
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Το όνομα του Αντικειμένου πρέπει να ξεκινά με x_ και να μην περιέχει "
-"ειδικούς χαρακτήρες!"
-
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,user_id:0
 msgid "Responsible"
 msgstr "Υπεύθυνος"
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Date of Claim"
-msgstr "Ημερ/νία Αξίωσης"
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Current"
@@ -672,6 +600,11 @@ msgstr "Θέματα ανά Στάδιο και Εκτιμήσεις"
 msgid "Reply"
 msgstr "Απάντηση"
 
+#. module: crm_claim
+#: field:crm.claim,cause:0
+msgid "Root Cause"
+msgstr ""
+
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim/Action Description"
@@ -688,7 +621,6 @@ msgid "Search Claims"
 msgstr "Αναζήτηση Απαιτήσεων"
 
 #. module: crm_claim
-#: view:crm.claim:0
 #: field:crm.claim,section_id:0
 #: view:crm.claim.report:0
 msgid "Sales Team"
@@ -699,6 +631,11 @@ msgstr "Ομάδα Πώλησης"
 msgid "May"
 msgstr "Μάιος"
 
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Resolution Actions"
+msgstr ""
+
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
@@ -706,20 +643,18 @@ msgid "Report a Claim"
 msgstr "Αναφορά Απαίτησης"
 
 #. module: crm_claim
-#: field:crm.claim,probability:0
-msgid "Probability (%)"
-msgstr "Πιθανότητα (%)"
+#: model:crm.case.stage,name:crm_claim.stage_claim2
+msgid "Actions Done"
+msgstr ""
 
 #. module: crm_claim
-#: field:crm.claim,partner_name:0
-msgid "Employee's Name"
-msgstr "Όνομα Υπαλλήλου"
+#: model:crm.case.stage,name:crm_claim.stage_claim5
+msgid "Actions Defined"
+msgstr ""
 
 #. module: crm_claim
-#: help:crm.claim,canal_id:0
-msgid ""
-"The channels represent the different communication  modes available with the "
-"customer."
+#: view:crm.claim:0
+msgid "Follow Up"
 msgstr ""
 
 #. module: crm_claim
@@ -734,21 +669,11 @@ msgid ""
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
 
-#. module: crm_claim
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "February"
 msgstr "Φεβρουάριος"
 
-#. module: crm_claim
-#: field:crm.claim,name:0
-msgid "Name"
-msgstr "Όνομα"
-
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
 msgid "Won't fix"
@@ -769,6 +694,11 @@ msgstr "Οι Υποθέσεις μου"
 msgid "ID"
 msgstr "ID"
 
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Actions"
+msgstr ""
+
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
@@ -787,13 +717,83 @@ msgstr ""
 msgid "Create Date"
 msgstr "Ημερομηνία Δημιουργίας"
 
-#. module: crm_claim
-#: field:crm.claim,date_action_last:0
-msgid "Last Action"
-msgstr "Τελευταία Ενέργεια"
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,name:0
 msgid "Year"
 msgstr "Έτος"
+
+#~ msgid "Mobile"
+#~ msgstr "Κινητό"
+
+#~ msgid "Extra Info"
+#~ msgstr "Επιπλέον Πληροφορίες"
+
+#~ msgid "Channel"
+#~ msgstr "Κανάλι"
+
+#~ msgid "Status and Categorization"
+#~ msgstr "Κατάσταση και Κατηγοριοποίηση"
+
+#~ msgid "Communication"
+#~ msgstr "Επικοινωνία"
+
+#~ msgid "References"
+#~ msgstr "Αναφορές"
+
+#~ msgid "Planned Revenue"
+#~ msgstr "Προβλεπόμενα Έσοδα"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Μη έγκυρο  ΧML για Προβολή Αρχιτεκτονικής!"
+
+#~ msgid "Closure Date"
+#~ msgstr "Ημερομηνία Κλεισίματος"
+
+#~ msgid "Reference 2"
+#~ msgstr "Παραπομπή 2"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Λάθος ! Δεν μπορείτε να δημιουργήσετε κενό Μενού"
+
+#~ msgid "Planned Costs"
+#~ msgstr "Προγραμματισμένο Κόστος"
+
+#~ msgid "Active"
+#~ msgstr "Ενεργή"
+
+#~ msgid "Awaiting Response"
+#~ msgstr "Σε αναμονή Ανταπόκρισης"
+
+#~ msgid "Date"
+#~ msgstr "Ημερομηνία"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Το όνομα του Αντικειμένου πρέπει να ξεκινά με x_ και να μην περιέχει "
+#~ "ειδικούς χαρακτήρες!"
+
+#~ msgid "Date of Claim"
+#~ msgstr "Ημερ/νία Αξίωσης"
+
+#~ msgid "Probability (%)"
+#~ msgstr "Πιθανότητα (%)"
+
+#~ msgid "Employee's Name"
+#~ msgstr "Όνομα Υπαλλήλου"
+
+#~ msgid "Name"
+#~ msgstr "Όνομα"
+
+#~ msgid "Fixed"
+#~ msgstr "Σταθερό"
+
+#~ msgid "Claim Info"
+#~ msgstr "Πληρ. Απαίτησης"
+
+#~ msgid "Last Action"
+#~ msgstr "Τελευταία Ενέργεια"
diff --git a/addons/crm_claim/i18n/es.po b/addons/crm_claim/i18n/es.po
index f7754eadf22..fc3a8d97723 100644
--- a/addons/crm_claim/i18n/es.po
+++ b/addons/crm_claim/i18n/es.po
@@ -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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
diff --git a/addons/crm_claim/i18n/fr.po b/addons/crm_claim/i18n/fr.po
index 321da23111f..52d9790cfd2 100644
--- a/addons/crm_claim/i18n/fr.po
+++ b/addons/crm_claim/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-12 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
diff --git a/addons/crm_claim/i18n/hr.po b/addons/crm_claim/i18n/hr.po
index cc1cf262b51..d48f6182254 100644
--- a/addons/crm_claim/i18n/hr.po
+++ b/addons/crm_claim/i18n/hr.po
@@ -7,21 +7,16 @@ 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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-29 07:48+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: crm_claim
-#: field:crm.claim,planned_revenue:0
-msgid "Planned Revenue"
-msgstr "Planirani prihod"
-
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
 msgid "# of Cases"
@@ -34,9 +29,14 @@ msgid "Group By..."
 msgstr "Grupiraj po..."
 
 #. module: crm_claim
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Neispravan naziv modela u definiciji akcije"
+#: view:crm.claim:0
+msgid "Responsibilities"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,date_action_next:0
+msgid "Next Action Date"
+msgstr ""
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -48,6 +48,11 @@ msgstr "Ožujak"
 msgid "Delay to close"
 msgstr "Odgodi zatvaranje"
 
+#. module: crm_claim
+#: field:crm.claim,resolution:0
+msgid "Resolution"
+msgstr ""
+
 #. module: crm_claim
 #: field:crm.claim,company_id:0
 #: view:crm.claim.report:0
@@ -66,8 +71,11 @@ msgid "#Claim"
 msgstr "#Zahtjeva"
 
 #. module: crm_claim
-#: view:crm.claim.report:0
-msgid "Cases"
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
+msgid ""
+"You can create claim stages to categorize the status of every claim entered "
+"in the system. The stages define all the steps required for the resolution "
+"of a claim."
 msgstr ""
 
 #. module: crm_claim
@@ -95,8 +103,8 @@ msgid ""
 msgstr ""
 
 #. module: crm_claim
-#: field:crm.claim,partner_mobile:0
-msgid "Mobile"
+#: view:crm.claim:0
+msgid "Claim Description"
 msgstr ""
 
 #. module: crm_claim
@@ -120,11 +128,6 @@ msgstr ""
 msgid "Preventive"
 msgstr ""
 
-#. module: crm_claim
-#: model:crm.case.stage,name:crm_claim.stage_claim2
-msgid "Fixed"
-msgstr ""
-
 #. module: crm_claim
 #: field:crm.claim,partner_address_id:0
 msgid "Partner Contact"
@@ -146,7 +149,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: crm_claim
-#: field:crm.claim,date_action_next:0
+#: field:crm.claim,action_next:0
 msgid "Next Action"
 msgstr ""
 
@@ -157,7 +160,9 @@ msgstr ""
 
 #. module: crm_claim
 #: view:crm.claim:0
-msgid "Extra Info"
+#: field:crm.claim,date_deadline:0
+#: field:crm.claim.report,date_deadline:0
+msgid "Deadline"
 msgstr ""
 
 #. module: crm_claim
@@ -174,21 +179,19 @@ msgstr ""
 msgid "Preventive Action"
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim,date_closed:0
-#: selection:crm.claim,state:0
-#: selection:crm.claim.report,state:0
-msgid "Closed"
-msgstr ""
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
 msgstr ""
 
 #. module: crm_claim
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:crm.claim:0
+msgid "Root Causes"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,user_fault:0
+msgid "Trouble Responsible"
 msgstr ""
 
 #. module: crm_claim
@@ -219,11 +222,6 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim,canal_id:0
-msgid "Channel"
-msgstr ""
-
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
@@ -236,10 +234,15 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: crm_claim
-#: view:crm.claim:0
-#: field:crm.claim,date_deadline:0
-#: field:crm.claim.report,date_deadline:0
-msgid "Deadline"
+#: field:crm.claim,name:0
+msgid "Claim Subject"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
 
 #. module: crm_claim
@@ -306,16 +309,6 @@ msgstr ""
 msgid "CRM Claim Report"
 msgstr ""
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "References"
-msgstr ""
-
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Status and Categorization"
-msgstr ""
-
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim1
 msgid "Accepted as Claim"
@@ -332,8 +325,8 @@ msgid "September"
 msgstr ""
 
 #. module: crm_claim
-#: view:crm.claim:0
-msgid "Communication"
+#: selection:crm.claim.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: crm_claim
@@ -358,11 +351,6 @@ msgstr ""
 msgid "Salesman"
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim,ref2:0
-msgid "Reference 2"
-msgstr ""
-
 #. module: crm_claim
 #: field:crm.claim,categ_id:0
 #: view:crm.claim.report:0
@@ -380,16 +368,6 @@ msgstr ""
 msgid "  Year  "
 msgstr ""
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Closure Date"
-msgstr ""
-
-#. module: crm_claim
-#: field:crm.claim,planned_cost:0
-msgid "Planned Costs"
-msgstr ""
-
 #. module: crm_claim
 #: help:crm.claim,email_cc:0
 msgid ""
@@ -412,8 +390,10 @@ msgid "Low"
 msgstr ""
 
 #. module: crm_claim
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: field:crm.claim,date_closed:0
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Closed"
 msgstr ""
 
 #. module: crm_claim
@@ -461,13 +441,8 @@ msgid "User"
 msgstr ""
 
 #. module: crm_claim
-#: model:crm.case.stage,name:crm_claim.stage_claim5
-msgid "Awaiting Response"
-msgstr ""
-
-#. module: crm_claim
-#: field:crm.claim,active:0
-msgid "Active"
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
+msgid "Claim Categories"
 msgstr ""
 
 #. module: crm_claim
@@ -502,6 +477,7 @@ msgstr ""
 
 #. module: crm_claim
 #: view:crm.claim:0
+#: field:crm.claim,date:0
 msgid "Claim Date"
 msgstr ""
 
@@ -510,11 +486,6 @@ msgstr ""
 msgid "These people will receive email."
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim,date:0
-msgid "Date"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
@@ -550,6 +521,16 @@ msgstr ""
 msgid "Attachments"
 msgstr ""
 
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
+msgid ""
+"Record and track your customers' claims. Claims can be linked to a sales "
+"order or a lot. You can send emails with attachments and get the history of "
+"everything that happened on a specific claim (emails sent, interventions "
+"type and so on..). Claims can be automatically linked to an email address "
+"using the mail gateway module."
+msgstr ""
+
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,state:0
@@ -558,11 +539,6 @@ msgstr ""
 msgid "State"
 msgstr ""
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Claim Info"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
@@ -570,8 +546,8 @@ msgid "Done"
 msgstr ""
 
 #. module: crm_claim
-#: selection:crm.claim.report,month:0
-msgid "December"
+#: view:crm.claim:0
+msgid "Claim Reporter"
 msgstr ""
 
 #. module: crm_claim
@@ -598,23 +574,12 @@ msgstr ""
 msgid "In Progress"
 msgstr ""
 
-#. module: crm_claim
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Date of Claim"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Current"
@@ -635,6 +600,11 @@ msgstr ""
 msgid "Reply"
 msgstr ""
 
+#. module: crm_claim
+#: field:crm.claim,cause:0
+msgid "Root Cause"
+msgstr ""
+
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim/Action Description"
@@ -650,11 +620,22 @@ msgstr ""
 msgid "Search Claims"
 msgstr ""
 
+#. module: crm_claim
+#: field:crm.claim,section_id:0
+#: view:crm.claim.report:0
+msgid "Sales Team"
+msgstr ""
+
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "May"
 msgstr ""
 
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Resolution Actions"
+msgstr ""
+
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
@@ -662,20 +643,18 @@ msgid "Report a Claim"
 msgstr ""
 
 #. module: crm_claim
-#: field:crm.claim,probability:0
-msgid "Probability (%)"
+#: model:crm.case.stage,name:crm_claim.stage_claim2
+msgid "Actions Done"
 msgstr ""
 
 #. module: crm_claim
-#: field:crm.claim,partner_name:0
-msgid "Employee's Name"
+#: model:crm.case.stage,name:crm_claim.stage_claim5
+msgid "Actions Defined"
 msgstr ""
 
 #. module: crm_claim
-#: help:crm.claim,canal_id:0
-msgid ""
-"The channels represent the different communication  modes available with the "
-"customer."
+#: view:crm.claim:0
+msgid "Follow Up"
 msgstr ""
 
 #. module: crm_claim
@@ -695,11 +674,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim,name:0
-msgid "Name"
-msgstr ""
-
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
 msgid "Won't fix"
@@ -720,6 +694,11 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Actions"
+msgstr ""
+
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
@@ -727,10 +706,10 @@ msgid "High"
 msgstr ""
 
 #. module: crm_claim
-#: view:crm.claim:0
-#: field:crm.claim,section_id:0
-#: view:crm.claim.report:0
-msgid "Sales Team"
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
+msgid ""
+"Create claim categories to better manage and classify your claims. Some "
+"example of claims can be: preventive action, corrective action."
 msgstr ""
 
 #. module: crm_claim
@@ -738,21 +717,17 @@ msgstr ""
 msgid "Create Date"
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim,date_action_last:0
-msgid "Last Action"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,name:0
 msgid "Year"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
-msgid "Claim Categories"
-msgstr ""
-
 #~ msgid "This Year"
 #~ msgstr "Ove godine"
+
+#~ msgid "Planned Revenue"
+#~ msgstr "Planirani prihod"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neispravan naziv modela u definiciji akcije"
diff --git a/addons/crm_claim/i18n/it.po b/addons/crm_claim/i18n/it.po
index ff6501ddbbb..852bf6b9fea 100644
--- a/addons/crm_claim/i18n/it.po
+++ b/addons/crm_claim/i18n/it.po
@@ -7,21 +7,16 @@ 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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-08 08:23+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-09 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: crm_claim
-#: field:crm.claim,planned_revenue:0
-msgid "Planned Revenue"
-msgstr ""
-
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
 msgid "# of Cases"
@@ -34,9 +29,14 @@ msgid "Group By..."
 msgstr "Ragguppato per..."
 
 #. module: crm_claim
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome del modello non valido nella definizione dell'azione."
+#: view:crm.claim:0
+msgid "Responsibilities"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,date_action_next:0
+msgid "Next Action Date"
+msgstr ""
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -48,6 +48,11 @@ msgstr "Marzo"
 msgid "Delay to close"
 msgstr "Ritardo per Chiusura"
 
+#. module: crm_claim
+#: field:crm.claim,resolution:0
+msgid "Resolution"
+msgstr ""
+
 #. module: crm_claim
 #: field:crm.claim,company_id:0
 #: view:crm.claim.report:0
@@ -66,9 +71,12 @@ msgid "#Claim"
 msgstr "# Iniziative"
 
 #. module: crm_claim
-#: view:crm.claim.report:0
-msgid "Cases"
-msgstr "Casi"
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
+msgid ""
+"You can create claim stages to categorize the status of every claim entered "
+"in the system. The stages define all the steps required for the resolution "
+"of a claim."
+msgstr ""
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
@@ -95,9 +103,9 @@ msgid ""
 msgstr ""
 
 #. module: crm_claim
-#: field:crm.claim,partner_mobile:0
-msgid "Mobile"
-msgstr "Cellulare"
+#: view:crm.claim:0
+msgid "Claim Description"
+msgstr ""
 
 #. module: crm_claim
 #: field:crm.claim,message_ids:0
@@ -120,11 +128,6 @@ msgstr "Cancellato"
 msgid "Preventive"
 msgstr "Preventivo"
 
-#. module: crm_claim
-#: model:crm.case.stage,name:crm_claim.stage_claim2
-msgid "Fixed"
-msgstr "Corretto"
-
 #. module: crm_claim
 #: field:crm.claim,partner_address_id:0
 msgid "Partner Contact"
@@ -146,7 +149,7 @@ msgid "Reference"
 msgstr "Riferimento"
 
 #. module: crm_claim
-#: field:crm.claim,date_action_next:0
+#: field:crm.claim,action_next:0
 msgid "Next Action"
 msgstr "Prossima Azione"
 
@@ -157,8 +160,10 @@ msgstr "Reimposta come Bozza"
 
 #. module: crm_claim
 #: view:crm.claim:0
-msgid "Extra Info"
-msgstr "Informazioni Aggiuntive"
+#: field:crm.claim,date_deadline:0
+#: field:crm.claim.report,date_deadline:0
+msgid "Deadline"
+msgstr ""
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -174,21 +179,19 @@ msgstr "Partner"
 msgid "Preventive Action"
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim,date_closed:0
-#: selection:crm.claim,state:0
-#: selection:crm.claim.report,state:0
-msgid "Closed"
-msgstr ""
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
 msgstr "Sezione"
 
 #. module: crm_claim
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:crm.claim:0
+msgid "Root Causes"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,user_fault:0
+msgid "Trouble Responsible"
 msgstr ""
 
 #. module: crm_claim
@@ -219,11 +222,6 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim,canal_id:0
-msgid "Channel"
-msgstr ""
-
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
@@ -236,10 +234,15 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: crm_claim
-#: view:crm.claim:0
-#: field:crm.claim,date_deadline:0
-#: field:crm.claim.report,date_deadline:0
-msgid "Deadline"
+#: field:crm.claim,name:0
+msgid "Claim Subject"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
 msgstr ""
 
 #. module: crm_claim
@@ -306,16 +309,6 @@ msgstr ""
 msgid "CRM Claim Report"
 msgstr ""
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "References"
-msgstr ""
-
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Status and Categorization"
-msgstr ""
-
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim1
 msgid "Accepted as Claim"
@@ -332,8 +325,8 @@ msgid "September"
 msgstr ""
 
 #. module: crm_claim
-#: view:crm.claim:0
-msgid "Communication"
+#: selection:crm.claim.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: crm_claim
@@ -358,11 +351,6 @@ msgstr ""
 msgid "Salesman"
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim,ref2:0
-msgid "Reference 2"
-msgstr ""
-
 #. module: crm_claim
 #: field:crm.claim,categ_id:0
 #: view:crm.claim.report:0
@@ -380,16 +368,6 @@ msgstr ""
 msgid "  Year  "
 msgstr ""
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Closure Date"
-msgstr ""
-
-#. module: crm_claim
-#: field:crm.claim,planned_cost:0
-msgid "Planned Costs"
-msgstr ""
-
 #. module: crm_claim
 #: help:crm.claim,email_cc:0
 msgid ""
@@ -412,8 +390,10 @@ msgid "Low"
 msgstr ""
 
 #. module: crm_claim
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: field:crm.claim,date_closed:0
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Closed"
 msgstr ""
 
 #. module: crm_claim
@@ -461,14 +441,9 @@ msgid "User"
 msgstr ""
 
 #. module: crm_claim
-#: model:crm.case.stage,name:crm_claim.stage_claim5
-msgid "Awaiting Response"
-msgstr ""
-
-#. module: crm_claim
-#: field:crm.claim,active:0
-msgid "Active"
-msgstr "Attivo"
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
+msgid "Claim Categories"
+msgstr "Categorie reclami"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -502,6 +477,7 @@ msgstr ""
 
 #. module: crm_claim
 #: view:crm.claim:0
+#: field:crm.claim,date:0
 msgid "Claim Date"
 msgstr "Data reclamo"
 
@@ -510,11 +486,6 @@ msgstr "Data reclamo"
 msgid "These people will receive email."
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim,date:0
-msgid "Date"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
@@ -550,6 +521,16 @@ msgstr "Reclamo"
 msgid "Attachments"
 msgstr ""
 
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
+msgid ""
+"Record and track your customers' claims. Claims can be linked to a sales "
+"order or a lot. You can send emails with attachments and get the history of "
+"everything that happened on a specific claim (emails sent, interventions "
+"type and so on..). Claims can be automatically linked to an email address "
+"using the mail gateway module."
+msgstr ""
+
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,state:0
@@ -558,11 +539,6 @@ msgstr ""
 msgid "State"
 msgstr ""
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Claim Info"
-msgstr "Informazioni reclamo"
-
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
@@ -570,8 +546,8 @@ msgid "Done"
 msgstr ""
 
 #. module: crm_claim
-#: selection:crm.claim.report,month:0
-msgid "December"
+#: view:crm.claim:0
+msgid "Claim Reporter"
 msgstr ""
 
 #. module: crm_claim
@@ -598,23 +574,12 @@ msgstr ""
 msgid "In Progress"
 msgstr ""
 
-#. module: crm_claim
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Date of Claim"
-msgstr "Data del reclamo"
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Current"
@@ -635,6 +600,11 @@ msgstr ""
 msgid "Reply"
 msgstr ""
 
+#. module: crm_claim
+#: field:crm.claim,cause:0
+msgid "Root Cause"
+msgstr ""
+
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim/Action Description"
@@ -650,11 +620,22 @@ msgstr ""
 msgid "Search Claims"
 msgstr "Cerca reclami"
 
+#. module: crm_claim
+#: field:crm.claim,section_id:0
+#: view:crm.claim.report:0
+msgid "Sales Team"
+msgstr ""
+
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "May"
 msgstr ""
 
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Resolution Actions"
+msgstr ""
+
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
@@ -662,20 +643,18 @@ msgid "Report a Claim"
 msgstr "Riporta un reclamo"
 
 #. module: crm_claim
-#: field:crm.claim,probability:0
-msgid "Probability (%)"
+#: model:crm.case.stage,name:crm_claim.stage_claim2
+msgid "Actions Done"
 msgstr ""
 
 #. module: crm_claim
-#: field:crm.claim,partner_name:0
-msgid "Employee's Name"
+#: model:crm.case.stage,name:crm_claim.stage_claim5
+msgid "Actions Defined"
 msgstr ""
 
 #. module: crm_claim
-#: help:crm.claim,canal_id:0
-msgid ""
-"The channels represent the different communication  modes available with the "
-"customer."
+#: view:crm.claim:0
+msgid "Follow Up"
 msgstr ""
 
 #. module: crm_claim
@@ -695,11 +674,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim,name:0
-msgid "Name"
-msgstr ""
-
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
 msgid "Won't fix"
@@ -720,6 +694,11 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Actions"
+msgstr ""
+
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
@@ -727,10 +706,10 @@ msgid "High"
 msgstr ""
 
 #. module: crm_claim
-#: view:crm.claim:0
-#: field:crm.claim,section_id:0
-#: view:crm.claim.report:0
-msgid "Sales Team"
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
+msgid ""
+"Create claim categories to better manage and classify your claims. Some "
+"example of claims can be: preventive action, corrective action."
 msgstr ""
 
 #. module: crm_claim
@@ -738,28 +717,27 @@ msgstr ""
 msgid "Create Date"
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim,date_action_last:0
-msgid "Last Action"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,name:0
 msgid "Year"
 msgstr ""
 
-#. module: crm_claim
-#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
-msgid "Claim Categories"
-msgstr "Categorie reclami"
-
 #~ msgid "This Year"
 #~ msgstr "Anno attuale"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome del modello non valido nella definizione dell'azione."
+
 #~ msgid "Claim Type"
 #~ msgstr "Tipo di richiesta"
 
+#~ msgid "Mobile"
+#~ msgstr "Cellulare"
+
+#~ msgid "Cases"
+#~ msgstr "Casi"
+
 #~ msgid ""
 #~ "The channels represent the different communicationmodes available with the "
 #~ "customer. With each commercial opportunity, you can indicate thecanall which "
@@ -771,3 +749,18 @@ msgstr "Categorie reclami"
 
 #~ msgid "My Case"
 #~ msgstr "I miei Casi"
+
+#~ msgid "Fixed"
+#~ msgstr "Corretto"
+
+#~ msgid "Extra Info"
+#~ msgstr "Informazioni Aggiuntive"
+
+#~ msgid "Active"
+#~ msgstr "Attivo"
+
+#~ msgid "Date of Claim"
+#~ msgstr "Data del reclamo"
+
+#~ msgid "Claim Info"
+#~ msgstr "Informazioni reclamo"
diff --git a/addons/crm_claim/i18n/nl.po b/addons/crm_claim/i18n/nl.po
index 4dcd784f481..8a18e2d3d55 100644
--- a/addons/crm_claim/i18n/nl.po
+++ b/addons/crm_claim/i18n/nl.po
@@ -7,21 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-12-01 08:47+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-12-02 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: crm_claim
-#: field:crm.claim,planned_revenue:0
-msgid "Planned Revenue"
-msgstr "Geplande omzet"
-
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
 msgid "# of Cases"
@@ -34,9 +29,14 @@ msgid "Group By..."
 msgstr "Groepeer op.."
 
 #. module: crm_claim
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de definitie van de actie."
+#: view:crm.claim:0
+msgid "Responsibilities"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,date_action_next:0
+msgid "Next Action Date"
+msgstr ""
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -48,6 +48,11 @@ msgstr "Maart"
 msgid "Delay to close"
 msgstr "Vertraging tot sluiting"
 
+#. module: crm_claim
+#: field:crm.claim,resolution:0
+msgid "Resolution"
+msgstr ""
+
 #. module: crm_claim
 #: field:crm.claim,company_id:0
 #: view:crm.claim.report:0
@@ -103,9 +108,9 @@ msgstr ""
 "verantwoordelijke gebruiker en email account voor mail gateway."
 
 #. module: crm_claim
-#: field:crm.claim,partner_mobile:0
-msgid "Mobile"
-msgstr "Mobiel"
+#: view:crm.claim:0
+msgid "Claim Description"
+msgstr ""
 
 #. module: crm_claim
 #: field:crm.claim,message_ids:0
@@ -128,11 +133,6 @@ msgstr "Geannuleerd"
 msgid "Preventive"
 msgstr "Preventief"
 
-#. module: crm_claim
-#: model:crm.case.stage,name:crm_claim.stage_claim2
-msgid "Fixed"
-msgstr "Opgelost"
-
 #. module: crm_claim
 #: field:crm.claim,partner_address_id:0
 msgid "Partner Contact"
@@ -154,7 +154,7 @@ msgid "Reference"
 msgstr "Referentie"
 
 #. module: crm_claim
-#: field:crm.claim,date_action_next:0
+#: field:crm.claim,action_next:0
 msgid "Next Action"
 msgstr "Volgende actie"
 
@@ -165,8 +165,10 @@ msgstr "Terugzetten naar Concept"
 
 #. module: crm_claim
 #: view:crm.claim:0
-msgid "Extra Info"
-msgstr "Extra info"
+#: field:crm.claim,date_deadline:0
+#: field:crm.claim.report,date_deadline:0
+msgid "Deadline"
+msgstr "Uiterste datum"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -176,33 +178,26 @@ msgstr "Extra info"
 msgid "Partner"
 msgstr "Relatie"
 
-#. module: crm_claim
-#: field:crm.claim,active:0
-msgid "Active"
-msgstr "Actief"
-
 #. module: crm_claim
 #: selection:crm.claim,type_action:0
 #: selection:crm.claim.report,type_action:0
 msgid "Preventive Action"
 msgstr "Preventieve actie"
 
-#. module: crm_claim
-#: field:crm.claim,date_closed:0
-#: selection:crm.claim,state:0
-#: selection:crm.claim.report,state:0
-msgid "Closed"
-msgstr "Gesloten"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
 msgstr "Afdeling"
 
 #. module: crm_claim
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave opbouw!"
+#: view:crm.claim:0
+msgid "Root Causes"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,user_fault:0
+msgid "Trouble Responsible"
+msgstr ""
 
 #. module: crm_claim
 #: field:crm.claim,priority:0
@@ -211,11 +206,6 @@ msgstr "Ongeldige XML voor weergave opbouw!"
 msgid "Priority"
 msgstr "Prioriteit"
 
-#. module: crm_claim
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "De modulenaam moet uniek zijn !"
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Send New Email"
@@ -237,11 +227,6 @@ msgstr "Soort"
 msgid "Email"
 msgstr "Email"
 
-#. module: crm_claim
-#: field:crm.claim,canal_id:0
-msgid "Channel"
-msgstr "Kanaal"
-
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
@@ -253,6 +238,11 @@ msgstr "Laagste"
 msgid "Creation Date"
 msgstr "Aanmaakdatum"
 
+#. module: crm_claim
+#: field:crm.claim,name:0
+msgid "Claim Subject"
+msgstr ""
+
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
 msgid ""
@@ -262,13 +252,6 @@ msgstr ""
 "Krijg een algemeen overzicht van alle klachten in het systeem door ze "
 "volgens specifieke criteria te sorteren."
 
-#. module: crm_claim
-#: view:crm.claim:0
-#: field:crm.claim,date_deadline:0
-#: field:crm.claim.report,date_deadline:0
-msgid "Deadline"
-msgstr "Uiterste datum"
-
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "July"
@@ -333,16 +316,6 @@ msgstr "Aantal dagen om de klacht te sluiten"
 msgid "CRM Claim Report"
 msgstr "CRM Klachtenrapport"
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "References"
-msgstr "Verwijzingen"
-
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Status and Categorization"
-msgstr "Status en and indeling"
-
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim1
 msgid "Accepted as Claim"
@@ -359,9 +332,9 @@ msgid "September"
 msgstr "September"
 
 #. module: crm_claim
-#: view:crm.claim:0
-msgid "Communication"
-msgstr "Communicatie"
+#: selection:crm.claim.report,month:0
+msgid "December"
+msgstr "December"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -385,11 +358,6 @@ msgstr "Wijzigingsdatum"
 msgid "Salesman"
 msgstr "Verkoper"
 
-#. module: crm_claim
-#: field:crm.claim,ref2:0
-msgid "Reference 2"
-msgstr "Referentie 2"
-
 #. module: crm_claim
 #: field:crm.claim,categ_id:0
 #: view:crm.claim.report:0
@@ -407,16 +375,6 @@ msgstr "Waarde klachten"
 msgid "  Year  "
 msgstr "  Jaar  "
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Closure Date"
-msgstr "Afsluitdatum"
-
-#. module: crm_claim
-#: field:crm.claim,planned_cost:0
-msgid "Planned Costs"
-msgstr "Verwachte kosten"
-
 #. module: crm_claim
 #: help:crm.claim,email_cc:0
 msgid ""
@@ -442,9 +400,11 @@ msgid "Low"
 msgstr "Laag"
 
 #. module: crm_claim
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fout ! U kunt geen recursief menu maken."
+#: field:crm.claim,date_closed:0
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Closed"
+msgstr "Gesloten"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -490,11 +450,6 @@ msgstr "Telefoon"
 msgid "User"
 msgstr "Gebruiker"
 
-#. module: crm_claim
-#: model:crm.case.stage,name:crm_claim.stage_claim5
-msgid "Awaiting Response"
-msgstr "Wacht op reactie"
-
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
 msgid "Claim Categories"
@@ -532,6 +487,7 @@ msgstr "Januari"
 
 #. module: crm_claim
 #: view:crm.claim:0
+#: field:crm.claim,date:0
 msgid "Claim Date"
 msgstr "Klachtdatum"
 
@@ -540,11 +496,6 @@ msgstr "Klachtdatum"
 msgid "These people will receive email."
 msgstr "Deze personen ontvangen email."
 
-#. module: crm_claim
-#: field:crm.claim,date:0
-msgid "Date"
-msgstr "Datum"
-
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
@@ -603,11 +554,6 @@ msgstr ""
 msgid "State"
 msgstr "Status"
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Claim Info"
-msgstr "Klacht Informatie"
-
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
@@ -615,9 +561,9 @@ msgid "Done"
 msgstr "Klaar"
 
 #. module: crm_claim
-#: selection:crm.claim.report,month:0
-msgid "December"
-msgstr "December"
+#: view:crm.claim:0
+msgid "Claim Reporter"
+msgstr ""
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -638,34 +584,17 @@ msgstr "Sluiten"
 msgid "Open"
 msgstr "Open"
 
-#. module: crm_claim
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "In Progress"
 msgstr "In behandeling"
 
-#. module: crm_claim
-#: 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: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,user_id:0
 msgid "Responsible"
 msgstr "Verantwoordelijke"
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Date of Claim"
-msgstr "Klachtdatum"
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Current"
@@ -686,6 +615,11 @@ msgstr "Klachten op fase en schattingen"
 msgid "Reply"
 msgstr "Beantwoorden"
 
+#. module: crm_claim
+#: field:crm.claim,cause:0
+msgid "Root Cause"
+msgstr ""
+
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim/Action Description"
@@ -702,7 +636,6 @@ msgid "Search Claims"
 msgstr "Zoek klachten"
 
 #. module: crm_claim
-#: view:crm.claim:0
 #: field:crm.claim,section_id:0
 #: view:crm.claim.report:0
 msgid "Sales Team"
@@ -713,6 +646,11 @@ msgstr "Verkoopteam"
 msgid "May"
 msgstr "Mei"
 
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Resolution Actions"
+msgstr ""
+
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
@@ -720,23 +658,19 @@ msgid "Report a Claim"
 msgstr "Rapporteer een klacht"
 
 #. module: crm_claim
-#: field:crm.claim,probability:0
-msgid "Probability (%)"
-msgstr "Waarschijnlijkheid (%)"
-
-#. module: crm_claim
-#: field:crm.claim,partner_name:0
-msgid "Employee's Name"
-msgstr "Werknemernaam"
-
-#. module: crm_claim
-#: help:crm.claim,canal_id:0
-msgid ""
-"The channels represent the different communication  modes available with the "
-"customer."
+#: model:crm.case.stage,name:crm_claim.stage_claim2
+msgid "Actions Done"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim5
+msgid "Actions Defined"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Follow Up"
 msgstr ""
-"Het kanalen vertegenwoordigen de verschillende beschikbare "
-"communicatievormen met de klant."
 
 #. module: crm_claim
 #: help:crm.claim,state:0
@@ -757,21 +691,11 @@ msgstr ""
 "            \n"
 "Als het dossier moet worden nagekeken, wordt de status op 'Wachtend' gezet."
 
-#. module: crm_claim
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "February"
 msgstr "Februari"
 
-#. module: crm_claim
-#: field:crm.claim,name:0
-msgid "Name"
-msgstr "Naam"
-
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
 msgid "Won't fix"
@@ -792,6 +716,11 @@ msgstr "Mijn klacht(en)"
 msgid "ID"
 msgstr "ID"
 
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Actions"
+msgstr ""
+
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
@@ -812,11 +741,6 @@ msgstr ""
 msgid "Create Date"
 msgstr "Aanmaakdatum"
 
-#. module: crm_claim
-#: field:crm.claim,date_action_last:0
-msgid "Last Action"
-msgstr "Laatste actie"
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,name:0
@@ -826,12 +750,30 @@ msgstr "Jaar"
 #~ msgid "This Year"
 #~ msgstr "Dit jaar"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
+
+#~ msgid "Mobile"
+#~ msgstr "Mobiel"
+
 #~ msgid "Cases"
 #~ msgstr "Dossiers"
 
+#~ msgid "Fixed"
+#~ msgstr "Opgelost"
+
+#~ msgid "Active"
+#~ msgstr "Actief"
+
+#~ msgid "Channel"
+#~ msgstr "Kanaal"
+
 #~ msgid "Claim Resource Type"
 #~ msgstr "Klacht Actie Soorten"
 
+#~ msgid "Reference 2"
+#~ msgstr "Referentie 2"
+
 #~ msgid "7 Days"
 #~ msgstr "7 Dagen"
 
@@ -853,15 +795,41 @@ msgstr "Jaar"
 #~ "klachten kunt maken op basis van ingekomen emails.\n"
 #~ "    "
 
+#~ msgid "Awaiting Response"
+#~ msgstr "Wacht op reactie"
+
 #~ msgid "Resource Type"
 #~ msgstr "Actie Soort"
 
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ 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 "Communication"
+#~ msgstr "Communicatie"
+
+#~ msgid "Claim Info"
+#~ msgstr "Klacht Informatie"
+
+#~ msgid "Date of Claim"
+#~ msgstr "Klachtdatum"
+
+#~ msgid "Name"
+#~ msgstr "Naam"
+
 #~ msgid "This Month"
 #~ msgstr "Deze maand"
 
 #~ msgid "Communication history"
 #~ msgstr "Communicatiegeschiedenis"
 
+#~ msgid "Last Action"
+#~ msgstr "Laatste actie"
+
 #~ msgid "Claim Type"
 #~ msgstr "Soort klacht"
 
@@ -877,5 +845,51 @@ msgstr "Jaar"
 #~ msgid "My Case"
 #~ msgstr "Mijn klacht"
 
+#~ msgid "Extra Info"
+#~ msgstr "Extra info"
+
 #~ msgid "Stage: "
 #~ msgstr "Fase: "
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML voor weergave opbouw!"
+
+#~ msgid "Status and Categorization"
+#~ msgstr "Status en and indeling"
+
+#~ msgid "Closure Date"
+#~ msgstr "Afsluitdatum"
+
+#~ msgid "Planned Costs"
+#~ msgstr "Verwachte kosten"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fout ! U kunt geen recursief menu maken."
+
+#~ msgid "Probability (%)"
+#~ msgstr "Waarschijnlijkheid (%)"
+
+#~ msgid "Employee's Name"
+#~ msgstr "Werknemernaam"
+
+#~ msgid "References"
+#~ msgstr "Verwijzingen"
+
+#~ msgid "Planned Revenue"
+#~ msgstr "Geplande omzet"
+
+#~ msgid ""
+#~ "The channels represent the different communication  modes available with the "
+#~ "customer."
+#~ msgstr ""
+#~ "Het kanalen vertegenwoordigen de verschillende beschikbare "
+#~ "communicatievormen met de klant."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "De modulenaam moet uniek zijn !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/crm_claim/i18n/pl.po b/addons/crm_claim/i18n/pl.po
index a1822d76554..f4328d05314 100644
--- a/addons/crm_claim/i18n/pl.po
+++ b/addons/crm_claim/i18n/pl.po
@@ -7,21 +7,16 @@ 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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-29 10:47+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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: crm_claim
-#: field:crm.claim,planned_revenue:0
-msgid "Planned Revenue"
-msgstr "Planowany dochód"
-
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
 msgid "# of Cases"
@@ -34,9 +29,14 @@ msgid "Group By..."
 msgstr "Grupuj wg..."
 
 #. module: crm_claim
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+#: view:crm.claim:0
+msgid "Responsibilities"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,date_action_next:0
+msgid "Next Action Date"
+msgstr ""
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -48,6 +48,11 @@ msgstr "Marzec"
 msgid "Delay to close"
 msgstr "Opóźnienie do zamknięcia"
 
+#. module: crm_claim
+#: field:crm.claim,resolution:0
+msgid "Resolution"
+msgstr ""
+
 #. module: crm_claim
 #: field:crm.claim,company_id:0
 #: view:crm.claim.report:0
@@ -66,9 +71,12 @@ msgid "#Claim"
 msgstr "#Reklamacja"
 
 #. module: crm_claim
-#: view:crm.claim.report:0
-msgid "Cases"
-msgstr "Sprawy"
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
+msgid ""
+"You can create claim stages to categorize the status of every claim entered "
+"in the system. The stages define all the steps required for the resolution "
+"of a claim."
+msgstr ""
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
@@ -95,9 +103,9 @@ msgid ""
 msgstr ""
 
 #. module: crm_claim
-#: field:crm.claim,partner_mobile:0
-msgid "Mobile"
-msgstr "Tel. komórkowy"
+#: view:crm.claim:0
+msgid "Claim Description"
+msgstr ""
 
 #. module: crm_claim
 #: field:crm.claim,message_ids:0
@@ -120,11 +128,6 @@ msgstr "Anulowano"
 msgid "Preventive"
 msgstr "Działania prewencyjne"
 
-#. module: crm_claim
-#: model:crm.case.stage,name:crm_claim.stage_claim2
-msgid "Fixed"
-msgstr "Naprawione"
-
 #. module: crm_claim
 #: field:crm.claim,partner_address_id:0
 msgid "Partner Contact"
@@ -146,7 +149,7 @@ msgid "Reference"
 msgstr "Odnośnik"
 
 #. module: crm_claim
-#: field:crm.claim,date_action_next:0
+#: field:crm.claim,action_next:0
 msgid "Next Action"
 msgstr "Następna akcja"
 
@@ -157,8 +160,10 @@ msgstr "Przywróć do projektu"
 
 #. module: crm_claim
 #: view:crm.claim:0
-msgid "Extra Info"
-msgstr "Dodatkowe informacje"
+#: field:crm.claim,date_deadline:0
+#: field:crm.claim.report,date_deadline:0
+msgid "Deadline"
+msgstr "Termin"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -174,22 +179,20 @@ msgstr "Partner"
 msgid "Preventive Action"
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim,date_closed:0
-#: selection:crm.claim,state:0
-#: selection:crm.claim.report,state:0
-msgid "Closed"
-msgstr "Zamknięte"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
 msgstr "Sekcja"
 
 #. module: crm_claim
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Niewłaściwy XML dla architektury widoku!"
+#: view:crm.claim:0
+msgid "Root Causes"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,user_fault:0
+msgid "Trouble Responsible"
+msgstr ""
 
 #. module: crm_claim
 #: field:crm.claim,priority:0
@@ -219,11 +222,6 @@ msgstr "Typ"
 msgid "Email"
 msgstr "E-mail"
 
-#. module: crm_claim
-#: field:crm.claim,canal_id:0
-msgid "Channel"
-msgstr "Kanał"
-
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
@@ -236,11 +234,16 @@ msgid "Creation Date"
 msgstr "Data utworzenia"
 
 #. module: crm_claim
-#: view:crm.claim:0
-#: field:crm.claim,date_deadline:0
-#: field:crm.claim.report,date_deadline:0
-msgid "Deadline"
-msgstr "Termin"
+#: field:crm.claim,name:0
+msgid "Claim Subject"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
+msgstr ""
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -306,16 +309,6 @@ msgstr "Liczba dni do zamknięcia sprawy"
 msgid "CRM Claim Report"
 msgstr "Raport reklamacji CRM"
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "References"
-msgstr "Odnośniki"
-
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Status and Categorization"
-msgstr ""
-
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim1
 msgid "Accepted as Claim"
@@ -332,9 +325,9 @@ msgid "September"
 msgstr "Wrzesień"
 
 #. module: crm_claim
-#: view:crm.claim:0
-msgid "Communication"
-msgstr "Komunikacja"
+#: selection:crm.claim.report,month:0
+msgid "December"
+msgstr "Grudzień"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -358,11 +351,6 @@ msgstr "Zaktualizuj datę"
 msgid "Salesman"
 msgstr ""
 
-#. module: crm_claim
-#: field:crm.claim,ref2:0
-msgid "Reference 2"
-msgstr "Odnośnik 2"
-
 #. module: crm_claim
 #: field:crm.claim,categ_id:0
 #: view:crm.claim.report:0
@@ -380,16 +368,6 @@ msgstr "Reklamacje wartości"
 msgid "  Year  "
 msgstr ""
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Closure Date"
-msgstr ""
-
-#. module: crm_claim
-#: field:crm.claim,planned_cost:0
-msgid "Planned Costs"
-msgstr "Planowane koszty"
-
 #. module: crm_claim
 #: help:crm.claim,email_cc:0
 msgid ""
@@ -412,9 +390,11 @@ msgid "Low"
 msgstr "Niski"
 
 #. module: crm_claim
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:crm.claim,date_closed:0
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Closed"
+msgstr "Zamknięte"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -461,14 +441,9 @@ msgid "User"
 msgstr "Użytkownik"
 
 #. module: crm_claim
-#: model:crm.case.stage,name:crm_claim.stage_claim5
-msgid "Awaiting Response"
-msgstr "Oczekuje na odpowiedź"
-
-#. module: crm_claim
-#: field:crm.claim,active:0
-msgid "Active"
-msgstr "Aktywne"
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
+msgid "Claim Categories"
+msgstr "Kategorie reklamacji"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -502,6 +477,7 @@ msgstr ""
 
 #. module: crm_claim
 #: view:crm.claim:0
+#: field:crm.claim,date:0
 msgid "Claim Date"
 msgstr "Data reklamacji"
 
@@ -510,11 +486,6 @@ msgstr "Data reklamacji"
 msgid "These people will receive email."
 msgstr "Ci ludzie otrzymają wiadomość"
 
-#. module: crm_claim
-#: field:crm.claim,date:0
-msgid "Date"
-msgstr "Data"
-
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
@@ -550,6 +521,16 @@ msgstr "Reklamacja"
 msgid "Attachments"
 msgstr "Załączniki"
 
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
+msgid ""
+"Record and track your customers' claims. Claims can be linked to a sales "
+"order or a lot. You can send emails with attachments and get the history of "
+"everything that happened on a specific claim (emails sent, interventions "
+"type and so on..). Claims can be automatically linked to an email address "
+"using the mail gateway module."
+msgstr ""
+
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,state:0
@@ -558,11 +539,6 @@ msgstr "Załączniki"
 msgid "State"
 msgstr "Stan"
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Claim Info"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
@@ -570,9 +546,9 @@ msgid "Done"
 msgstr "Wykonano"
 
 #. module: crm_claim
-#: selection:crm.claim.report,month:0
-msgid "December"
-msgstr "Grudzień"
+#: view:crm.claim:0
+msgid "Claim Reporter"
+msgstr ""
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -598,25 +574,12 @@ msgstr "Otwórz"
 msgid "In Progress"
 msgstr "W toku"
 
-#. module: crm_claim
-#: 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: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,user_id:0
 msgid "Responsible"
 msgstr "Odpowiedzialny"
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Date of Claim"
-msgstr "Data reklamacji"
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Current"
@@ -637,6 +600,11 @@ msgstr "Sprawy wg etapów i szacunków"
 msgid "Reply"
 msgstr "Odpowiedz"
 
+#. module: crm_claim
+#: field:crm.claim,cause:0
+msgid "Root Cause"
+msgstr ""
+
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim/Action Description"
@@ -652,11 +620,22 @@ msgstr "Opis"
 msgid "Search Claims"
 msgstr "Przeszukaj reklamacje"
 
+#. module: crm_claim
+#: field:crm.claim,section_id:0
+#: view:crm.claim.report:0
+msgid "Sales Team"
+msgstr ""
+
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "May"
 msgstr "Maj"
 
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Resolution Actions"
+msgstr ""
+
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
@@ -664,20 +643,18 @@ msgid "Report a Claim"
 msgstr ""
 
 #. module: crm_claim
-#: field:crm.claim,probability:0
-msgid "Probability (%)"
-msgstr "Prawdopodobieństwo (%)"
+#: model:crm.case.stage,name:crm_claim.stage_claim2
+msgid "Actions Done"
+msgstr ""
 
 #. module: crm_claim
-#: field:crm.claim,partner_name:0
-msgid "Employee's Name"
-msgstr "Nazwisko pracownika"
+#: model:crm.case.stage,name:crm_claim.stage_claim5
+msgid "Actions Defined"
+msgstr ""
 
 #. module: crm_claim
-#: help:crm.claim,canal_id:0
-msgid ""
-"The channels represent the different communication  modes available with the "
-"customer."
+#: view:crm.claim:0
+msgid "Follow Up"
 msgstr ""
 
 #. module: crm_claim
@@ -704,11 +681,6 @@ msgstr ""
 msgid "February"
 msgstr "Luty"
 
-#. module: crm_claim
-#: field:crm.claim,name:0
-msgid "Name"
-msgstr "Nazwa"
-
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
 msgid "Won't fix"
@@ -729,6 +701,11 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Actions"
+msgstr ""
+
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
@@ -736,10 +713,10 @@ msgid "High"
 msgstr "Wysoki"
 
 #. module: crm_claim
-#: view:crm.claim:0
-#: field:crm.claim,section_id:0
-#: view:crm.claim.report:0
-msgid "Sales Team"
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
+msgid ""
+"Create claim categories to better manage and classify your claims. Some "
+"example of claims can be: preventive action, corrective action."
 msgstr ""
 
 #. module: crm_claim
@@ -747,42 +724,98 @@ msgstr ""
 msgid "Create Date"
 msgstr "Data utworzenia"
 
-#. module: crm_claim
-#: field:crm.claim,date_action_last:0
-msgid "Last Action"
-msgstr "Ostatnia akcja"
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,name:0
 msgid "Year"
 msgstr "Rok"
 
-#. module: crm_claim
-#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
-msgid "Claim Categories"
-msgstr "Kategorie reklamacji"
-
 #~ msgid "This Year"
 #~ msgstr "W tym roku"
 
+#~ msgid "Planned Revenue"
+#~ msgstr "Planowany dochód"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
 #~ msgid "Claim Type"
 #~ msgstr "Typ reklamacji"
 
+#~ msgid "Mobile"
+#~ msgstr "Tel. komórkowy"
+
+#~ msgid "Cases"
+#~ msgstr "Sprawy"
+
 #~ msgid "My Case"
 #~ msgstr "Moja sprawa"
 
+#~ msgid "Fixed"
+#~ msgstr "Naprawione"
+
+#~ msgid "Extra Info"
+#~ msgstr "Dodatkowe informacje"
+
+#~ msgid "Active"
+#~ msgstr "Aktywne"
+
 #~ msgid "Stage: "
 #~ msgstr "Etap: "
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Niewłaściwy XML dla architektury widoku!"
+
+#~ msgid "Channel"
+#~ msgstr "Kanał"
+
+#~ msgid "Planned Costs"
+#~ msgstr "Planowane koszty"
+
+#~ msgid "Reference 2"
+#~ msgstr "Odnośnik 2"
+
 #~ msgid "Type of Action"
 #~ msgstr "Typ akcji"
 
+#~ msgid "Awaiting Response"
+#~ msgstr "Oczekuje na odpowiedź"
+
 #~ msgid "Resource Type"
 #~ msgstr "Typ zasobu"
 
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ 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 "Communication"
+#~ msgstr "Komunikacja"
+
+#~ msgid "Probability (%)"
+#~ msgstr "Prawdopodobieństwo (%)"
+
+#~ msgid "Date of Claim"
+#~ msgstr "Data reklamacji"
+
+#~ msgid "Employee's Name"
+#~ msgstr "Nazwisko pracownika"
+
+#~ msgid "Name"
+#~ msgstr "Nazwa"
+
 #~ msgid "This Month"
 #~ msgstr "W tym miesiącu"
 
 #~ msgid "Communication history"
 #~ msgstr "Historia komunikacji"
+
+#~ msgid "References"
+#~ msgstr "Odnośniki"
+
+#~ msgid "Last Action"
+#~ msgstr "Ostatnia akcja"
diff --git a/addons/crm_claim/i18n/pt.po b/addons/crm_claim/i18n/pt.po
index abf0a89e048..6239deb1bcc 100644
--- a/addons/crm_claim/i18n/pt.po
+++ b/addons/crm_claim/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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
diff --git a/addons/crm_claim/i18n/pt_BR.po b/addons/crm_claim/i18n/pt_BR.po
index 739ed0bebff..d445cd7a5da 100644
--- a/addons/crm_claim/i18n/pt_BR.po
+++ b/addons/crm_claim/i18n/pt_BR.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-12 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
diff --git a/addons/crm_claim/i18n/sr.po b/addons/crm_claim/i18n/sr.po
index 6ac8b28913c..b270decf821 100644
--- a/addons/crm_claim/i18n/sr.po
+++ b/addons/crm_claim/i18n/sr.po
@@ -7,21 +7,16 @@ 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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-03 08:04+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-04 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: crm_claim
-#: field:crm.claim,planned_revenue:0
-msgid "Planned Revenue"
-msgstr "Planirani Prihod"
-
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
 msgid "# of Cases"
@@ -34,9 +29,14 @@ msgid "Group By..."
 msgstr "Grupisano po"
 
 #. module: crm_claim
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Neispravno ime modela u definiciji akcije"
+#: view:crm.claim:0
+msgid "Responsibilities"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,date_action_next:0
+msgid "Next Action Date"
+msgstr ""
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -48,6 +48,11 @@ msgstr "Mart"
 msgid "Delay to close"
 msgstr "Kasnjenje do Zatvaranja"
 
+#. module: crm_claim
+#: field:crm.claim,resolution:0
+msgid "Resolution"
+msgstr ""
+
 #. module: crm_claim
 #: field:crm.claim,company_id:0
 #: view:crm.claim.report:0
@@ -66,9 +71,12 @@ msgid "#Claim"
 msgstr "#Zahtev"
 
 #. module: crm_claim
-#: view:crm.claim.report:0
-msgid "Cases"
-msgstr "Slucajevi"
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
+msgid ""
+"You can create claim stages to categorize the status of every claim entered "
+"in the system. The stages define all the steps required for the resolution "
+"of a claim."
+msgstr ""
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
@@ -97,9 +105,9 @@ msgstr ""
 "nalog za slanje Emailova."
 
 #. module: crm_claim
-#: field:crm.claim,partner_mobile:0
-msgid "Mobile"
-msgstr "Mobilni"
+#: view:crm.claim:0
+msgid "Claim Description"
+msgstr ""
 
 #. module: crm_claim
 #: field:crm.claim,message_ids:0
@@ -122,11 +130,6 @@ msgstr "Otkazano"
 msgid "Preventive"
 msgstr "Preventiva"
 
-#. module: crm_claim
-#: model:crm.case.stage,name:crm_claim.stage_claim2
-msgid "Fixed"
-msgstr ""
-
 #. module: crm_claim
 #: field:crm.claim,partner_address_id:0
 msgid "Partner Contact"
@@ -148,7 +151,7 @@ msgid "Reference"
 msgstr "Referenca"
 
 #. module: crm_claim
-#: field:crm.claim,date_action_next:0
+#: field:crm.claim,action_next:0
 msgid "Next Action"
 msgstr "Sledeca Akcija"
 
@@ -159,8 +162,10 @@ msgstr "Postavi 'U Pripremu'"
 
 #. module: crm_claim
 #: view:crm.claim:0
-msgid "Extra Info"
-msgstr "Dodatne Informacije"
+#: field:crm.claim,date_deadline:0
+#: field:crm.claim.report,date_deadline:0
+msgid "Deadline"
+msgstr "Krajnji Rok"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -176,22 +181,20 @@ msgstr "Partner"
 msgid "Preventive Action"
 msgstr "Preventivna Akcija"
 
-#. module: crm_claim
-#: field:crm.claim,date_closed:0
-#: selection:crm.claim,state:0
-#: selection:crm.claim.report,state:0
-msgid "Closed"
-msgstr "Zatvoreno"
-
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
 msgstr "Sekcija"
 
 #. module: crm_claim
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neispravan XML za pregled Arhitekture!"
+#: view:crm.claim:0
+msgid "Root Causes"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,user_fault:0
+msgid "Trouble Responsible"
+msgstr ""
 
 #. module: crm_claim
 #: field:crm.claim,priority:0
@@ -221,11 +224,6 @@ msgstr "Tip"
 msgid "Email"
 msgstr "Email"
 
-#. module: crm_claim
-#: field:crm.claim,canal_id:0
-msgid "Channel"
-msgstr "Kanal"
-
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
@@ -238,11 +236,16 @@ msgid "Creation Date"
 msgstr "Datum Kreiranja"
 
 #. module: crm_claim
-#: view:crm.claim:0
-#: field:crm.claim,date_deadline:0
-#: field:crm.claim.report,date_deadline:0
-msgid "Deadline"
-msgstr "Krajnji Rok"
+#: field:crm.claim,name:0
+msgid "Claim Subject"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
+msgstr ""
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -308,16 +311,6 @@ msgstr "Br Dana Do zatvaranja Slucaja"
 msgid "CRM Claim Report"
 msgstr "Izvestaj CRM Zahteva"
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "References"
-msgstr "Reference"
-
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Status and Categorization"
-msgstr "Status i Kategorizacija"
-
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim1
 msgid "Accepted as Claim"
@@ -334,9 +327,9 @@ msgid "September"
 msgstr "Septembar"
 
 #. module: crm_claim
-#: view:crm.claim:0
-msgid "Communication"
-msgstr "Komunikacija"
+#: selection:crm.claim.report,month:0
+msgid "December"
+msgstr "Decembar"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -360,11 +353,6 @@ msgstr "Obnovi Datum"
 msgid "Salesman"
 msgstr "Prodavac"
 
-#. module: crm_claim
-#: field:crm.claim,ref2:0
-msgid "Reference 2"
-msgstr "Referenca 2"
-
 #. module: crm_claim
 #: field:crm.claim,categ_id:0
 #: view:crm.claim.report:0
@@ -382,16 +370,6 @@ msgstr "vrednost Zahteva"
 msgid "  Year  "
 msgstr "  Godina  "
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Closure Date"
-msgstr "Datum zatvaranja"
-
-#. module: crm_claim
-#: field:crm.claim,planned_cost:0
-msgid "Planned Costs"
-msgstr "Planirani Troskovi"
-
 #. module: crm_claim
 #: help:crm.claim,email_cc:0
 msgid ""
@@ -416,9 +394,11 @@ msgid "Low"
 msgstr "Nizak"
 
 #. module: crm_claim
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Greska ! Ne mozes kreirati rekursivni meni."
+#: field:crm.claim,date_closed:0
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Closed"
+msgstr "Zatvoreno"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -465,14 +445,9 @@ msgid "User"
 msgstr "Korisnik"
 
 #. module: crm_claim
-#: model:crm.case.stage,name:crm_claim.stage_claim5
-msgid "Awaiting Response"
-msgstr "Čeka se odgovor"
-
-#. module: crm_claim
-#: field:crm.claim,active:0
-msgid "Active"
-msgstr "Aktivan"
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
+msgid "Claim Categories"
+msgstr "Kategorije Potrazivanja"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -506,6 +481,7 @@ msgstr "Januar"
 
 #. module: crm_claim
 #: view:crm.claim:0
+#: field:crm.claim,date:0
 msgid "Claim Date"
 msgstr "Datum Zahteva"
 
@@ -514,11 +490,6 @@ msgstr "Datum Zahteva"
 msgid "These people will receive email."
 msgstr "Ovi ce ljudi primiti Email"
 
-#. module: crm_claim
-#: field:crm.claim,date:0
-msgid "Date"
-msgstr "Datum"
-
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
@@ -554,6 +525,16 @@ msgstr "Potraživanje"
 msgid "Attachments"
 msgstr "Dodatak"
 
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
+msgid ""
+"Record and track your customers' claims. Claims can be linked to a sales "
+"order or a lot. You can send emails with attachments and get the history of "
+"everything that happened on a specific claim (emails sent, interventions "
+"type and so on..). Claims can be automatically linked to an email address "
+"using the mail gateway module."
+msgstr ""
+
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,state:0
@@ -562,11 +543,6 @@ msgstr "Dodatak"
 msgid "State"
 msgstr "Stanje"
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Claim Info"
-msgstr "Info Potraživanja"
-
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
@@ -574,9 +550,9 @@ msgid "Done"
 msgstr "Zavrseno"
 
 #. module: crm_claim
-#: selection:crm.claim.report,month:0
-msgid "December"
-msgstr "Decembar"
+#: view:crm.claim:0
+msgid "Claim Reporter"
+msgstr ""
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -602,24 +578,12 @@ msgstr "Otvori"
 msgid "In Progress"
 msgstr "U Progresu"
 
-#. module: crm_claim
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,user_id:0
 msgid "Responsible"
 msgstr "Odgovoran"
 
-#. module: crm_claim
-#: view:crm.claim:0
-msgid "Date of Claim"
-msgstr "Datum Potrazivanja"
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Current"
@@ -640,6 +604,11 @@ msgstr "Slucjajevi po Nivoima i Ocekivanjima"
 msgid "Reply"
 msgstr "Odgovori"
 
+#. module: crm_claim
+#: field:crm.claim,cause:0
+msgid "Root Cause"
+msgstr ""
+
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim/Action Description"
@@ -655,11 +624,22 @@ msgstr ""
 msgid "Search Claims"
 msgstr "Opis"
 
+#. module: crm_claim
+#: field:crm.claim,section_id:0
+#: view:crm.claim.report:0
+msgid "Sales Team"
+msgstr "Prodajni Tim"
+
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "May"
 msgstr "Maj"
 
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Resolution Actions"
+msgstr ""
+
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
@@ -667,23 +647,19 @@ msgid "Report a Claim"
 msgstr "Izvestaj Potrazivanja"
 
 #. module: crm_claim
-#: field:crm.claim,probability:0
-msgid "Probability (%)"
-msgstr "Verovatnoca (%)"
-
-#. module: crm_claim
-#: field:crm.claim,partner_name:0
-msgid "Employee's Name"
-msgstr "Ime Zaposlenog"
-
-#. module: crm_claim
-#: help:crm.claim,canal_id:0
-msgid ""
-"The channels represent the different communication  modes available with the "
-"customer."
+#: model:crm.case.stage,name:crm_claim.stage_claim2
+msgid "Actions Done"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim5
+msgid "Actions Defined"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Follow Up"
 msgstr ""
-"Kanal reprezentuje razlicite komunikacione nacine dostupnih za komunikaciju "
-"sa Klijentom"
 
 #. module: crm_claim
 #: help:crm.claim,state:0
@@ -711,11 +687,6 @@ msgstr ""
 msgid "February"
 msgstr "Februar"
 
-#. module: crm_claim
-#: field:crm.claim,name:0
-msgid "Name"
-msgstr "Ime"
-
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
 msgid "Won't fix"
@@ -736,6 +707,11 @@ msgstr "Moj/i Slucaj(evi)"
 msgid "ID"
 msgstr "ID"
 
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Actions"
+msgstr ""
+
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
@@ -743,29 +719,100 @@ msgid "High"
 msgstr "Visoko"
 
 #. module: crm_claim
-#: view:crm.claim:0
-#: field:crm.claim,section_id:0
-#: view:crm.claim.report:0
-msgid "Sales Team"
-msgstr "Prodajni Tim"
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
+msgid ""
+"Create claim categories to better manage and classify your claims. Some "
+"example of claims can be: preventive action, corrective action."
+msgstr ""
 
 #. module: crm_claim
 #: field:crm.claim.report,create_date:0
 msgid "Create Date"
 msgstr "Datum Kreiranja"
 
-#. module: crm_claim
-#: field:crm.claim,date_action_last:0
-msgid "Last Action"
-msgstr "Poslednja Akcija"
-
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,name:0
 msgid "Year"
 msgstr "Godina"
 
-#. module: crm_claim
-#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
-msgid "Claim Categories"
-msgstr "Kategorije Potrazivanja"
+#~ msgid "Cases"
+#~ msgstr "Slucajevi"
+
+#~ msgid "Planned Revenue"
+#~ msgstr "Planirani Prihod"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neispravno ime modela u definiciji akcije"
+
+#~ msgid "Mobile"
+#~ msgstr "Mobilni"
+
+#~ msgid "Extra Info"
+#~ msgstr "Dodatne Informacije"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neispravan XML za pregled Arhitekture!"
+
+#~ msgid "Channel"
+#~ msgstr "Kanal"
+
+#~ msgid "Status and Categorization"
+#~ msgstr "Status i Kategorizacija"
+
+#~ msgid "References"
+#~ msgstr "Reference"
+
+#~ msgid "Communication"
+#~ msgstr "Komunikacija"
+
+#~ msgid "Planned Costs"
+#~ msgstr "Planirani Troskovi"
+
+#~ msgid "Closure Date"
+#~ msgstr "Datum zatvaranja"
+
+#~ msgid "Reference 2"
+#~ msgstr "Referenca 2"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
+
+#~ msgid "Active"
+#~ msgstr "Aktivan"
+
+#~ msgid "Awaiting Response"
+#~ msgstr "Čeka se odgovor"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Claim Info"
+#~ msgstr "Info Potraživanja"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
+
+#~ msgid "Date of Claim"
+#~ msgstr "Datum Potrazivanja"
+
+#~ msgid "Probability (%)"
+#~ msgstr "Verovatnoca (%)"
+
+#~ msgid "Employee's Name"
+#~ msgstr "Ime Zaposlenog"
+
+#~ msgid "Name"
+#~ msgstr "Ime"
+
+#~ msgid ""
+#~ "The channels represent the different communication  modes available with the "
+#~ "customer."
+#~ msgstr ""
+#~ "Kanal reprezentuje razlicite komunikacione nacine dostupnih za komunikaciju "
+#~ "sa Klijentom"
+
+#~ msgid "Last Action"
+#~ msgstr "Poslednja Akcija"
diff --git a/addons/crm_claim/i18n/sr@latin.po b/addons/crm_claim/i18n/sr@latin.po
index d66fd71d3fb..5f5107980d0 100644
--- a/addons/crm_claim/i18n/sr@latin.po
+++ b/addons/crm_claim/i18n/sr@latin.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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
diff --git a/addons/crm_claim/i18n/sv.po b/addons/crm_claim/i18n/sv.po
index 8220cfba8a5..bea8b956f84 100644
--- a/addons/crm_claim/i18n/sv.po
+++ b/addons/crm_claim/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-04 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+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 c5fb7a0ee52..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-14 05:36+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_helpdesk/i18n/es.po b/addons/crm_helpdesk/i18n/es.po
index abdb111a462..52e2e42d1ae 100644
--- a/addons/crm_helpdesk/i18n/es.po
+++ b/addons/crm_helpdesk/i18n/es.po
@@ -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-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
diff --git a/addons/crm_helpdesk/i18n/fr.po b/addons/crm_helpdesk/i18n/fr.po
index 7eeccd81c6a..a1768e31db6 100644
--- a/addons/crm_helpdesk/i18n/fr.po
+++ b/addons/crm_helpdesk/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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-30 12:19+0000\n"
 "Last-Translator: <>\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-10-30 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: crm_helpdesk
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Today"
@@ -59,11 +54,6 @@ msgstr ""
 msgid "Watchers Emails"
 msgstr ""
 
-#. module: crm_helpdesk
-#: view:crm.helpdesk.report:0
-msgid "Cases"
-msgstr ""
-
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
@@ -147,13 +137,6 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,date_closed:0
-#: selection:crm.helpdesk,state:0
-#: selection:crm.helpdesk.report,state:0
-msgid "Closed"
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Estimates"
@@ -164,11 +147,6 @@ msgstr ""
 msgid "Section"
 msgstr ""
 
-#. module: crm_helpdesk
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: field:crm.helpdesk,priority:0
@@ -374,8 +352,10 @@ msgid "Low"
 msgstr ""
 
 #. module: crm_helpdesk
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
 msgstr ""
 
 #. module: crm_helpdesk
@@ -542,12 +522,6 @@ msgstr ""
 msgid "Categorization"
 msgstr ""
 
-#. module: crm_helpdesk
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
@@ -576,6 +550,13 @@ msgstr ""
 msgid "Reply"
 msgstr ""
 
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
+msgid ""
+"Create and manage helpdesk categories to better manage and classify your "
+"support request."
+msgstr ""
+
 #. module: crm_helpdesk
 #: field:crm.helpdesk,description:0
 msgid "Description"
@@ -586,6 +567,15 @@ msgstr ""
 msgid "May"
 msgstr ""
 
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
+msgid ""
+"'Helpdesk and Support' allows you to track your interventions. Select a "
+"customer, add notes and categorize interventions with partners if necessary "
+"and assign a priority level. Depending on your need, you may consider using "
+"the issues system of OpenERP to manage your support activities."
+msgstr ""
+
 #. module: crm_helpdesk
 #: field:crm.helpdesk,probability:0
 msgid "Probability (%)"
@@ -596,6 +586,14 @@ msgstr ""
 msgid "# Emails"
 msgstr ""
 
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
+msgid ""
+"Have a general overview of all support requests by sorting them with "
+"specific criteria such as the processing time, number of requests answered, "
+"emails sent and costs."
+msgstr ""
+
 #. module: crm_helpdesk
 #: help:crm.helpdesk,canal_id:0
 msgid ""
diff --git a/addons/crm_helpdesk/i18n/it.po b/addons/crm_helpdesk/i18n/it.po
index b88dcc79cd6..6c1f5185b86 100644
--- a/addons/crm_helpdesk/i18n/it.po
+++ b/addons/crm_helpdesk/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:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-23 09:48+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-24 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
@@ -33,11 +33,6 @@ msgstr "# di casi"
 msgid "Group By..."
 msgstr "Raggruppa per..."
 
-#. module: crm_helpdesk
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome del modulo non valido nella definizione dell'azione"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Today"
@@ -143,13 +138,6 @@ msgstr "Informazioni extra"
 msgid "Partner"
 msgstr "Partner"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,date_closed:0
-#: selection:crm.helpdesk,state:0
-#: selection:crm.helpdesk.report,state:0
-msgid "Closed"
-msgstr "Chiuso"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Estimates"
@@ -160,11 +148,6 @@ msgstr ""
 msgid "Section"
 msgstr "Sezione"
 
-#. module: crm_helpdesk
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per la struttura della vista!"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: field:crm.helpdesk,priority:0
@@ -173,11 +156,6 @@ msgstr "XML non valido per la struttura della vista!"
 msgid "Priority"
 msgstr "Priorità"
 
-#. module: crm_helpdesk
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere unico!"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Send New Email"
@@ -375,9 +353,11 @@ msgid "Low"
 msgstr ""
 
 #. module: crm_helpdesk
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Errore! Non è possibile creare un menù ricorsivo."
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr "Chiuso"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -533,11 +513,6 @@ msgstr "Chiuso"
 msgid "Open"
 msgstr ""
 
-#. module: crm_helpdesk
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Helpdesk Support Tree"
@@ -548,14 +523,6 @@ msgstr ""
 msgid "Categorization"
 msgstr ""
 
-#. module: crm_helpdesk
-#: 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 deve contenere "
-"caratteri speciali!"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
@@ -657,11 +624,6 @@ msgstr ""
 "Se il caso ha bisogno di essere rivisto allora lo stato è impostato a \"In "
 "sospeso\"."
 
-#. module: crm_helpdesk
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "February"
@@ -726,5 +688,23 @@ msgstr "Anno"
 msgid "Duration"
 msgstr ""
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome del modulo non valido nella definizione dell'azione"
+
 #~ msgid "Cases"
 #~ msgstr "Casi"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
+
+#~ 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 deve contenere "
+#~ "caratteri speciali!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per la struttura della vista!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Il nome del modulo deve essere unico!"
diff --git a/addons/crm_helpdesk/i18n/nl.po b/addons/crm_helpdesk/i18n/nl.po
index eb490dd1160..364cf70cc3d 100644
--- a/addons/crm_helpdesk/i18n/nl.po
+++ b/addons/crm_helpdesk/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-11-18 16:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-12-01 07:12+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-12-02 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
@@ -33,11 +33,6 @@ msgstr "# Aanvragen"
 msgid "Group By..."
 msgstr "Groepeer op.."
 
-#. module: crm_helpdesk
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de definitie van de actie."
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Today"
@@ -143,13 +138,6 @@ msgstr "Extra info"
 msgid "Partner"
 msgstr "Relatie"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,date_closed:0
-#: selection:crm.helpdesk,state:0
-#: selection:crm.helpdesk.report,state:0
-msgid "Closed"
-msgstr "Gesloten"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Estimates"
@@ -160,11 +148,6 @@ msgstr "Schattingen"
 msgid "Section"
 msgstr "Afdeling"
 
-#. module: crm_helpdesk
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave opbouw!"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: field:crm.helpdesk,priority:0
@@ -173,11 +156,6 @@ msgstr "Ongeldige XML voor weergave opbouw!"
 msgid "Priority"
 msgstr "Prioriteit"
 
-#. module: crm_helpdesk
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "De modulenaam moet uniek zijn !"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Send New Email"
@@ -378,9 +356,11 @@ msgid "Low"
 msgstr "Laag"
 
 #. module: crm_helpdesk
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fout ! U kunt geen recursief menu maken."
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr "Gesloten"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -538,11 +518,6 @@ msgstr "Sluiten"
 msgid "Open"
 msgstr "Open"
 
-#. module: crm_helpdesk
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Helpdesk Support Tree"
@@ -553,13 +528,6 @@ msgstr "Helpdesk aanvragen"
 msgid "Categorization"
 msgstr "Classificatie"
 
-#. module: crm_helpdesk
-#: 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: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
@@ -670,11 +638,6 @@ msgstr ""
 "Als de aanvraag moet worden onderzocht, wordt de status op 'Behandeling' "
 "gezet."
 
-#. module: crm_helpdesk
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "February"
@@ -739,12 +702,20 @@ msgstr "Jaar"
 msgid "Duration"
 msgstr "Duur"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
+
 #~ msgid "This Year"
 #~ msgstr "Dit jaar"
 
 #~ msgid "Delay to close"
 #~ msgstr "Vertraging tot sluiting"
 
+#~ 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 "Communication history"
 #~ msgstr "Communicatiegeschiedenis"
 
@@ -756,3 +727,18 @@ msgstr "Duur"
 
 #~ msgid "Cases"
 #~ msgstr "Aanvragen"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML voor weergave opbouw!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fout ! U kunt geen recursief menu maken."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "De modulenaam moet uniek zijn !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
diff --git a/addons/crm_helpdesk/i18n/pl.po b/addons/crm_helpdesk/i18n/pl.po
index e34ad3be9b2..f0d7473cac8 100644
--- a/addons/crm_helpdesk/i18n/pl.po
+++ b/addons/crm_helpdesk/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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-29 10:37+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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
@@ -33,11 +33,6 @@ msgstr "# spraw"
 msgid "Group By..."
 msgstr "Grupuj wg..."
 
-#. module: crm_helpdesk
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Today"
@@ -60,11 +55,6 @@ msgstr "Firma"
 msgid "Watchers Emails"
 msgstr "Adresy obserwatorów"
 
-#. module: crm_helpdesk
-#: view:crm.helpdesk.report:0
-msgid "Cases"
-msgstr "Sprawy"
-
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
@@ -148,13 +138,6 @@ msgstr "Dodatkowe informacje"
 msgid "Partner"
 msgstr "Partner"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,date_closed:0
-#: selection:crm.helpdesk,state:0
-#: selection:crm.helpdesk.report,state:0
-msgid "Closed"
-msgstr "Zamknięte"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Estimates"
@@ -165,11 +148,6 @@ msgstr "Szacunki"
 msgid "Section"
 msgstr "Sekcja"
 
-#. module: crm_helpdesk
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Niewłaściwy XML dla architektury widoku!"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: field:crm.helpdesk,priority:0
@@ -375,9 +353,11 @@ msgid "Low"
 msgstr "Niski"
 
 #. module: crm_helpdesk
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr "Zamknięte"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -543,14 +523,6 @@ msgstr "Drzewo wsparcia helpdesku"
 msgid "Categorization"
 msgstr "Kategorie"
 
-#. module: crm_helpdesk
-#: 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: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
@@ -579,6 +551,13 @@ msgstr "Szczegóły"
 msgid "Reply"
 msgstr "Odpowiedz"
 
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
+msgid ""
+"Create and manage helpdesk categories to better manage and classify your "
+"support request."
+msgstr ""
+
 #. module: crm_helpdesk
 #: field:crm.helpdesk,description:0
 msgid "Description"
@@ -589,6 +568,15 @@ msgstr "Opis"
 msgid "May"
 msgstr "Maj"
 
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
+msgid ""
+"'Helpdesk and Support' allows you to track your interventions. Select a "
+"customer, add notes and categorize interventions with partners if necessary "
+"and assign a priority level. Depending on your need, you may consider using "
+"the issues system of OpenERP to manage your support activities."
+msgstr ""
+
 #. module: crm_helpdesk
 #: field:crm.helpdesk,probability:0
 msgid "Probability (%)"
@@ -599,6 +587,14 @@ msgstr "Prawdopodobieństwo (%)"
 msgid "# Emails"
 msgstr ""
 
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
+msgid ""
+"Have a general overview of all support requests by sorting them with "
+"specific criteria such as the processing time, number of requests answered, "
+"emails sent and costs."
+msgstr ""
+
 #. module: crm_helpdesk
 #: help:crm.helpdesk,canal_id:0
 msgid ""
@@ -689,12 +685,27 @@ msgstr "Rok"
 msgid "Duration"
 msgstr "Czas trwania"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
+#~ msgid "Cases"
+#~ msgstr "Sprawy"
+
 #~ msgid "This Year"
 #~ msgstr "W tym roku"
 
 #~ msgid "Delay to close"
 #~ msgstr "Opóźnienie do zamknięcia"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Niewłaściwy XML dla architektury widoku!"
+
+#~ 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 "Communication history"
 #~ msgstr "Historia komunikacji"
 
diff --git a/addons/crm_helpdesk/i18n/pt.po b/addons/crm_helpdesk/i18n/pt.po
index ce2a8e50ca3..5fc3d8e51f7 100644
--- a/addons/crm_helpdesk/i18n/pt.po
+++ b/addons/crm_helpdesk/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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
diff --git a/addons/crm_helpdesk/i18n/pt_BR.po b/addons/crm_helpdesk/i18n/pt_BR.po
index b2c6f890379..fc56f7015eb 100644
--- a/addons/crm_helpdesk/i18n/pt_BR.po
+++ b/addons/crm_helpdesk/i18n/pt_BR.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-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
diff --git a/addons/crm_helpdesk/i18n/ru.po b/addons/crm_helpdesk/i18n/ru.po
index 02e3448ca6a..d306b34da0b 100644
--- a/addons/crm_helpdesk/i18n/ru.po
+++ b/addons/crm_helpdesk/i18n/ru.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-09 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
diff --git a/addons/crm_helpdesk/i18n/sr.po b/addons/crm_helpdesk/i18n/sr.po
index 0d8167f05d7..ec8a459eb2a 100644
--- a/addons/crm_helpdesk/i18n/sr.po
+++ b/addons/crm_helpdesk/i18n/sr.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-02 07:23+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-03 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
@@ -33,11 +33,6 @@ msgstr "# Slucajeva"
 msgid "Group By..."
 msgstr "Grupirano po"
 
-#. module: crm_helpdesk
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Neispravno ime modela u definiciji Akcije."
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Today"
@@ -60,11 +55,6 @@ msgstr "Preduzece"
 msgid "Watchers Emails"
 msgstr "Praceni Emailovi"
 
-#. module: crm_helpdesk
-#: view:crm.helpdesk.report:0
-msgid "Cases"
-msgstr "Slucajevi"
-
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
@@ -148,13 +138,6 @@ msgstr "Dodatne Informacije"
 msgid "Partner"
 msgstr "Partner"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,date_closed:0
-#: selection:crm.helpdesk,state:0
-#: selection:crm.helpdesk.report,state:0
-msgid "Closed"
-msgstr "Zatvoreno"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Estimates"
@@ -165,11 +148,6 @@ msgstr "Ocekivano"
 msgid "Section"
 msgstr "Sekcija"
 
-#. module: crm_helpdesk
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neispravan XML za Pregled arhitekture!"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: field:crm.helpdesk,priority:0
@@ -378,9 +356,11 @@ msgid "Low"
 msgstr "Nizak"
 
 #. module: crm_helpdesk
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Greska ! Ne mozes kreirati rekursivni meni."
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr "Zatvoreno"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -548,13 +528,6 @@ msgstr "HelpDesk pregled Podrske"
 msgid "Categorization"
 msgstr "Kategorizacija"
 
-#. module: crm_helpdesk
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
@@ -583,6 +556,13 @@ msgstr "Detalji"
 msgid "Reply"
 msgstr "Odgovor"
 
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
+msgid ""
+"Create and manage helpdesk categories to better manage and classify your "
+"support request."
+msgstr ""
+
 #. module: crm_helpdesk
 #: field:crm.helpdesk,description:0
 msgid "Description"
@@ -593,6 +573,15 @@ msgstr "Opis"
 msgid "May"
 msgstr "Maj"
 
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
+msgid ""
+"'Helpdesk and Support' allows you to track your interventions. Select a "
+"customer, add notes and categorize interventions with partners if necessary "
+"and assign a priority level. Depending on your need, you may consider using "
+"the issues system of OpenERP to manage your support activities."
+msgstr ""
+
 #. module: crm_helpdesk
 #: field:crm.helpdesk,probability:0
 msgid "Probability (%)"
@@ -603,6 +592,14 @@ msgstr "Verovatnoca (%)"
 msgid "# Emails"
 msgstr "# Emailovi"
 
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
+msgid ""
+"Have a general overview of all support requests by sorting them with "
+"specific criteria such as the processing time, number of requests answered, "
+"emails sent and costs."
+msgstr ""
+
 #. module: crm_helpdesk
 #: help:crm.helpdesk,canal_id:0
 msgid ""
@@ -693,3 +690,20 @@ msgstr "Godina"
 #: field:crm.helpdesk,duration:0
 msgid "Duration"
 msgstr "Kasnjenje"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neispravno ime modela u definiciji Akcije."
+
+#~ msgid "Cases"
+#~ msgstr "Slucajevi"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neispravan XML za Pregled arhitekture!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
diff --git a/addons/crm_helpdesk/i18n/sr@latin.po b/addons/crm_helpdesk/i18n/sr@latin.po
index cd603cddb47..c6963a47a8e 100644
--- a/addons/crm_helpdesk/i18n/sr@latin.po
+++ b/addons/crm_helpdesk/i18n/sr@latin.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-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+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 e94a51e0b99..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-12 18:12+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_partner_assign
@@ -35,7 +35,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "Número de casos"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -96,7 +96,7 @@ msgstr ""
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_date:0
 msgid "Partner Date"
-msgstr ""
+msgstr "Data do parceiro"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -134,7 +134,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Data de fecho"
 
 #. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
@@ -147,7 +147,7 @@ msgstr ""
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendente"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,name:0
@@ -161,18 +161,18 @@ msgstr "Parceiro"
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
-msgstr ""
+msgstr "Probabilidade média"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
-msgstr ""
+msgstr "Anterior"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/partner_geo_assign.py:0
 #, python-format
 msgid "Network error"
-msgstr ""
+msgstr "Erro de rede"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_cc:0
@@ -184,7 +184,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
-msgstr ""
+msgstr "De"
 
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
@@ -192,7 +192,7 @@ msgstr ""
 #: field:res.partner,grade_id:0
 #: view:res.partner.grade:0
 msgid "Partner Grade"
-msgstr ""
+msgstr "Nível do parceiro"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -214,7 +214,7 @@ msgstr "Prioridade"
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
@@ -224,7 +224,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,html:0
 msgid "HTML formatting?"
-msgstr ""
+msgstr "Formatação em HTML?"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,type:0
@@ -359,7 +359,7 @@ msgstr "Mês"
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
-msgstr ""
+msgstr "Data de abertura"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
@@ -374,7 +374,7 @@ msgstr "Vendedor"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply To"
-msgstr ""
+msgstr "Responder a"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -429,7 +429,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
-msgstr ""
+msgstr "Probabilidade máxima"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -486,7 +486,7 @@ msgstr "Novembro"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros avançados"
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
@@ -574,7 +574,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Send new email"
-msgstr ""
+msgstr "Enviar nova mensagem"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -620,7 +620,7 @@ msgstr "Fevereiro"
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,name:0
 msgid "Email Address"
-msgstr ""
+msgstr "Endereço eletrónico"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
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 69dc4404645..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-13 16:51+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-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
@@ -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/decimal_precision/i18n/pt.po b/addons/decimal_precision/i18n/pt.po
index 72f0107fbed..0e2bfaf8dcd 100644
--- a/addons/decimal_precision/i18n/pt.po
+++ b/addons/decimal_precision/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 18:04+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2010-12-14 22:13+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:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: decimal_precision
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/ar.po b/addons/delivery/i18n/ar.po
index 43c04a6f50c..09d7eaffd57 100644
--- a/addons/delivery/i18n/ar.po
+++ b/addons/delivery/i18n/ar.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/bg.po b/addons/delivery/i18n/bg.po
index 011d6121266..3aaf73497ef 100644
--- a/addons/delivery/i18n/bg.po
+++ b/addons/delivery/i18n/bg.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/bs.po b/addons/delivery/i18n/bs.po
index 74743117b20..305681e62d5 100644
--- a/addons/delivery/i18n/bs.po
+++ b/addons/delivery/i18n/bs.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/ca.po b/addons/delivery/i18n/ca.po
index da874d363fe..742ffe3d220 100644
--- a/addons/delivery/i18n/ca.po
+++ b/addons/delivery/i18n/ca.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/cs.po b/addons/delivery/i18n/cs.po
index d101337af65..16120b37a8f 100644
--- a/addons/delivery/i18n/cs.po
+++ b/addons/delivery/i18n/cs.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/de.po b/addons/delivery/i18n/de.po
index 0c3de2aa4bb..1f47634886f 100644
--- a/addons/delivery/i18n/de.po
+++ b/addons/delivery/i18n/de.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
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/el.po b/addons/delivery/i18n/el.po
index 563d8bb99d5..a6e04443218 100644
--- a/addons/delivery/i18n/el.po
+++ b/addons/delivery/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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/es.po b/addons/delivery/i18n/es.po
index 5ee3da9023d..513ed843a9d 100644
--- a/addons/delivery/i18n/es.po
+++ b/addons/delivery/i18n/es.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/es_AR.po b/addons/delivery/i18n/es_AR.po
index 4f9c5dea5b4..51483b9c332 100644
--- a/addons/delivery/i18n/es_AR.po
+++ b/addons/delivery/i18n/es_AR.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/es_EC.po b/addons/delivery/i18n/es_EC.po
index 029edb0cfab..c10b4b0b5c7 100644
--- a/addons/delivery/i18n/es_EC.po
+++ b/addons/delivery/i18n/es_EC.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/et.po b/addons/delivery/i18n/et.po
index 8bbd5bfe673..dcc595825fa 100644
--- a/addons/delivery/i18n/et.po
+++ b/addons/delivery/i18n/et.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/fi.po b/addons/delivery/i18n/fi.po
index 8ca1c60920d..e8fa9b4b903 100644
--- a/addons/delivery/i18n/fi.po
+++ b/addons/delivery/i18n/fi.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/fr.po b/addons/delivery/i18n/fr.po
index 4e369bacdf9..8a4cd2fd12b 100644
--- a/addons/delivery/i18n/fr.po
+++ b/addons/delivery/i18n/fr.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #~ msgid "Invalid XML for View Architecture!"
diff --git a/addons/delivery/i18n/hr.po b/addons/delivery/i18n/hr.po
index 4b2300d99b2..29ebec9e0d6 100644
--- a/addons/delivery/i18n/hr.po
+++ b/addons/delivery/i18n/hr.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/delivery/i18n/hu.po b/addons/delivery/i18n/hu.po
index 4bf3c4b03c1..17e632a5a7c 100644
--- a/addons/delivery/i18n/hu.po
+++ b/addons/delivery/i18n/hu.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/id.po b/addons/delivery/i18n/id.po
index d06d58d0911..29a0e43ddd7 100644
--- a/addons/delivery/i18n/id.po
+++ b/addons/delivery/i18n/id.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/it.po b/addons/delivery/i18n/it.po
index 0f8f2f28e21..822f3fa23ac 100644
--- a/addons/delivery/i18n/it.po
+++ b/addons/delivery/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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/ko.po b/addons/delivery/i18n/ko.po
index dc22b2224a6..f03355aa7cc 100644
--- a/addons/delivery/i18n/ko.po
+++ b/addons/delivery/i18n/ko.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/lt.po b/addons/delivery/i18n/lt.po
index db641764ac5..1c478078d71 100644
--- a/addons/delivery/i18n/lt.po
+++ b/addons/delivery/i18n/lt.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/mn.po b/addons/delivery/i18n/mn.po
index 0b37d4e3891..9b392f49727 100644
--- a/addons/delivery/i18n/mn.po
+++ b/addons/delivery/i18n/mn.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/nl.po b/addons/delivery/i18n/nl.po
index 63c913c2ac7..d6ecb212eff 100644
--- a/addons/delivery/i18n/nl.po
+++ b/addons/delivery/i18n/nl.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/nl_BE.po b/addons/delivery/i18n/nl_BE.po
index af01a8d9843..a95fa477f96 100644
--- a/addons/delivery/i18n/nl_BE.po
+++ b/addons/delivery/i18n/nl_BE.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/pl.po b/addons/delivery/i18n/pl.po
index 16a300c7969..d5704221cf0 100644
--- a/addons/delivery/i18n/pl.po
+++ b/addons/delivery/i18n/pl.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/pt.po b/addons/delivery/i18n/pt.po
index b3c95162e48..c99b7f0306a 100644
--- a/addons/delivery/i18n/pt.po
+++ b/addons/delivery/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:23+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2010-12-14 23:04+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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/pt_BR.po b/addons/delivery/i18n/pt_BR.po
index 8e4bec1f502..9a66d886358 100644
--- a/addons/delivery/i18n/pt_BR.po
+++ b/addons/delivery/i18n/pt_BR.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/ro.po b/addons/delivery/i18n/ro.po
index d480a17a4d5..92d8a87e4f4 100644
--- a/addons/delivery/i18n/ro.po
+++ b/addons/delivery/i18n/ro.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index ef448be6678..a88e906410a 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/sl.po b/addons/delivery/i18n/sl.po
index a7418a86489..358f5bbeb36 100644
--- a/addons/delivery/i18n/sl.po
+++ b/addons/delivery/i18n/sl.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/sq.po b/addons/delivery/i18n/sq.po
index 74b79d3ecdb..f33bab85e42 100644
--- a/addons/delivery/i18n/sq.po
+++ b/addons/delivery/i18n/sq.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/sr.po b/addons/delivery/i18n/sr.po
index a4d6eb7e73f..4499de67e1e 100644
--- a/addons/delivery/i18n/sr.po
+++ b/addons/delivery/i18n/sr.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/sr@latin.po b/addons/delivery/i18n/sr@latin.po
index 8d52f32b059..f039de5f1c7 100644
--- a/addons/delivery/i18n/sr@latin.po
+++ b/addons/delivery/i18n/sr@latin.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/sv.po b/addons/delivery/i18n/sv.po
index 85363d3a6a9..622c95a2973 100644
--- a/addons/delivery/i18n/sv.po
+++ b/addons/delivery/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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/tlh.po b/addons/delivery/i18n/tlh.po
index d8146d52804..9692630b01e 100644
--- a/addons/delivery/i18n/tlh.po
+++ b/addons/delivery/i18n/tlh.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po
index 507bf4a6eff..f5f7af49bd4 100644
--- a/addons/delivery/i18n/tr.po
+++ b/addons/delivery/i18n/tr.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/uk.po b/addons/delivery/i18n/uk.po
index 1b186e571dd..7271983492d 100644
--- a/addons/delivery/i18n/uk.po
+++ b/addons/delivery/i18n/uk.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/vi.po b/addons/delivery/i18n/vi.po
index 73030c8db20..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-14 05:01+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/i18n/zh_CN.po b/addons/delivery/i18n/zh_CN.po
index 8b6c97e7a04..b08234a72d4 100644
--- a/addons/delivery/i18n/zh_CN.po
+++ b/addons/delivery/i18n/zh_CN.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/zh_TW.po b/addons/delivery/i18n/zh_TW.po
index f5e60f666aa..e785e9610cb 100644
--- a/addons/delivery/i18n/zh_TW.po
+++ b/addons/delivery/i18n/zh_TW.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+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/de.po b/addons/document_ftp/i18n/de.po
index 4e18b36554c..981eb0d5eda 100644
--- a/addons/document_ftp/i18n/de.po
+++ b/addons/document_ftp/i18n/de.po
@@ -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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
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/es.po b/addons/document_ftp/i18n/es.po
index 36e7b1c0af9..0c29cc1b6b4 100644
--- a/addons/document_ftp/i18n/es.po
+++ b/addons/document_ftp/i18n/es.po
@@ -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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
diff --git a/addons/document_ftp/i18n/fr.po b/addons/document_ftp/i18n/fr.po
index 3b813ebb9de..b2e7bac89e1 100644
--- a/addons/document_ftp/i18n/fr.po
+++ b/addons/document_ftp/i18n/fr.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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
diff --git a/addons/document_ftp/i18n/it.po b/addons/document_ftp/i18n/it.po
index 2d6433074cb..e134fef9b74 100644
--- a/addons/document_ftp/i18n/it.po
+++ b/addons/document_ftp/i18n/it.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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
diff --git a/addons/document_ftp/i18n/nl.po b/addons/document_ftp/i18n/nl.po
index e155a5b3033..a904698d5a4 100644
--- a/addons/document_ftp/i18n/nl.po
+++ b/addons/document_ftp/i18n/nl.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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
diff --git a/addons/document_ftp/i18n/pl.po b/addons/document_ftp/i18n/pl.po
index 24c34fb00bb..a0efb46118f 100644
--- a/addons/document_ftp/i18n/pl.po
+++ b/addons/document_ftp/i18n/pl.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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
diff --git a/addons/document_ftp/i18n/pt.po b/addons/document_ftp/i18n/pt.po
index c6f7149d1eb..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-14 05:37+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/pt_BR.po b/addons/document_ftp/i18n/pt_BR.po
index 908c9e3807c..ed86c04a5a4 100644
--- a/addons/document_ftp/i18n/pt_BR.po
+++ b/addons/document_ftp/i18n/pt_BR.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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
diff --git a/addons/document_ftp/i18n/sr.po b/addons/document_ftp/i18n/sr.po
index f643d21752f..65827320bd7 100644
--- a/addons/document_ftp/i18n/sr.po
+++ b/addons/document_ftp/i18n/sr.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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
diff --git a/addons/document_ftp/i18n/sr@latin.po b/addons/document_ftp/i18n/sr@latin.po
index 5fda80ae1e3..a99912b2305 100644
--- a/addons/document_ftp/i18n/sr@latin.po
+++ b/addons/document_ftp/i18n/sr@latin.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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+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 f934569b418..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-14 05:37+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/ar.po b/addons/document_ics/i18n/ar.po
index c6ac3fa8d16..51d814609fc 100644
--- a/addons/document_ics/i18n/ar.po
+++ b/addons/document_ics/i18n/ar.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,12 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -62,12 +56,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
+msgid "dtstamp"
 msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -90,11 +86,6 @@ msgstr ""
 msgid "Manages an Helpdesk service."
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -202,8 +193,8 @@ msgid "location"
 msgstr ""
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
 msgstr ""
 
 #. module: document_ics
@@ -352,15 +343,3 @@ msgstr ""
 #: field:document.ics.crm.wizard,opportunity:0
 msgid "Business Opportunities"
 msgstr ""
-
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
diff --git a/addons/document_ics/i18n/bg.po b/addons/document_ics/i18n/bg.po
index 9001fe8ca9b..4569538980a 100644
--- a/addons/document_ics/i18n/bg.po
+++ b/addons/document_ics/i18n/bg.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-04 05:58+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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,14 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-"символи!"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -64,12 +56,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
+msgid "dtstamp"
 msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -92,11 +86,6 @@ msgstr ""
 msgid "Manages an Helpdesk service."
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -204,9 +193,9 @@ msgid "location"
 msgstr ""
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr ""
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -355,14 +344,11 @@ msgstr ""
 msgid "Business Opportunities"
 msgstr ""
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
+#~ "символи!"
 
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Невалиден XML за преглед на архитектурата"
diff --git a/addons/document_ics/i18n/bs.po b/addons/document_ics/i18n/bs.po
index e5d30368c51..375a90f6a98 100644
--- a/addons/document_ics/i18n/bs.po
+++ b/addons/document_ics/i18n/bs.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-04 05:58+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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,12 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -62,12 +56,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
+msgid "dtstamp"
 msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -90,11 +86,6 @@ msgstr ""
 msgid "Manages an Helpdesk service."
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -202,9 +193,9 @@ msgid "location"
 msgstr ""
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr ""
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -353,14 +344,5 @@ msgstr ""
 msgid "Business Opportunities"
 msgstr ""
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
diff --git a/addons/document_ics/i18n/ca.po b/addons/document_ics/i18n/ca.po
index aee3a28904d..a4c3a14084a 100644
--- a/addons/document_ics/i18n/ca.po
+++ b/addons/document_ics/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-18 12:57+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -29,14 +29,6 @@ msgstr ""
 msgid "Object"
 msgstr "Objecte"
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-"especial!"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -67,12 +59,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr "assistent"
+msgid "dtstamp"
+msgstr "dtstamp (marca data-hora)"
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -95,11 +89,6 @@ msgstr "Reunions de calendari compartides"
 msgid "Manages an Helpdesk service."
 msgstr "Gestiona un servei d'assistència/ajuda."
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de model no vàlid en la definició de l'acció."
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -208,9 +197,9 @@ msgid "location"
 msgstr "ubicació"
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "assistent"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -359,17 +348,11 @@ msgstr "URL"
 msgid "Business Opportunities"
 msgstr "Oportunitats de negoci"
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr "dtstamp (marca data-hora)"
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+#~ "especial!"
 
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Error! No podeu crear directoris recursius."
@@ -377,6 +360,9 @@ msgstr ""
 #~ msgid "Open ERP Field"
 #~ msgstr "Camp OpenERP"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invàlid per a la definició de la vista!"
+
 #~ msgid "document.directory.ics.fields"
 #~ msgstr "document.directori.ics.camps"
 
@@ -401,6 +387,9 @@ msgstr ""
 #~ "Utilitzat per les companyies pel seguiment d'errors i peticions de suport "
 #~ "sobre programes informàtics"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom de model no vàlid en la definició de l'acció."
+
 #~ msgid ""
 #~ "Help you to organise the jobs hiring process: evaluation, meetings, email "
 #~ "integration..."
diff --git a/addons/document_ics/i18n/cs.po b/addons/document_ics/i18n/cs.po
index 2f1a91b9e27..625e1419014 100644
--- a/addons/document_ics/i18n/cs.po
+++ b/addons/document_ics/i18n/cs.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 03:48+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,13 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr "Objekt"
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -63,12 +56,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
+msgid "dtstamp"
 msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -91,11 +86,6 @@ msgstr ""
 msgid "Manages an Helpdesk service."
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Špatný název modelu v definici akce"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -203,9 +193,9 @@ msgid "location"
 msgstr "lokace"
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalidní XML pro zobrazení architektury!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr ""
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -354,21 +344,20 @@ msgstr "url"
 msgid "Business Opportunities"
 msgstr ""
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
-
 #~ msgid "Next"
 #~ msgstr "Dále"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Špatný název modelu v definici akce"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalidní XML pro zobrazení architektury!"
+
 #~ msgid "Prospect"
 #~ msgstr "Prospekt"
 
diff --git a/addons/document_ics/i18n/de.po b/addons/document_ics/i18n/de.po
index d307c44a5ae..506ad3509fc 100644
--- a/addons/document_ics/i18n/de.po
+++ b/addons/document_ics/i18n/de.po
@@ -6,7 +6,7 @@ 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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-30 15:26+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -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-01 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -31,14 +31,6 @@ msgstr ""
 msgid "Object"
 msgstr "Objekt"
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -69,13 +61,17 @@ msgstr "Intervalle in Stunden"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr "Teilnehmer"
+msgid "dtstamp"
+msgstr "dtstamp"
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
-msgstr "Fehler ! Sie können kein rekursives Sales Team haben."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
+msgstr ""
+"Das Feld welches für die Vergabe eines Dateinamens genutzt wird. Es sollte "
+"eine eindeutige Bezeichnung aufweisen."
 
 #. module: document_ics
 #: field:document.directory.ics.fields,content_id:0
@@ -97,11 +93,6 @@ msgstr "Gemeinsamer Terminkalender"
 msgid "Manages an Helpdesk service."
 msgstr "Managt einen Anwendersupport."
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "ungültiger Modulname in der Aktionsdefinition"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -202,11 +193,6 @@ msgstr "OpenERP Feld"
 msgid "ICS Calendar"
 msgstr "ICS-Kalender"
 
-#. module: document_ics
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: document_ics
 #: field:document.directory.ics.fields,name:0
 msgid "ICS Value"
@@ -217,25 +203,15 @@ msgstr "ICS Wert"
 msgid "Expression as constant"
 msgstr "Ausdruck (Expression) als Konstante"
 
-#. module: document_ics
-#: sql_constraint:crm.case.section:0
-msgid "The code of the sales team must be unique !"
-msgstr "Die Kurzbezeichnung für das Vertriebsteam sollte eindeutig sein !"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "location"
 msgstr "Verzeichnis"
 
 #. module: document_ics
-#: 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 !"
-
-#. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "Teilnehmer"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -388,24 +364,11 @@ msgstr "url"
 msgid "Business Opportunities"
 msgstr "Verkaufschancen"
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr "dtstamp"
-
-#. module: document_ics
-#: 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 !"
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
-"Das Feld welches für die Vergabe eines Dateinamens genutzt wird. Es sollte "
-"eine eindeutige Bezeichnung aufweisen."
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
 
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Fehler! Sie können keine rekursiven Ordner erzeugen."
@@ -413,6 +376,9 @@ msgstr ""
 #~ msgid "Open ERP Field"
 #~ msgstr "OpenERP Feld"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "document.directory.ics.fields"
 #~ msgstr "document.directory.ics.fields"
 
@@ -475,3 +441,21 @@ msgstr ""
 
 #~ msgid "Create Pre-Configured Calendars"
 #~ msgstr "Erzeuge vorkonfigurierte Kalender"
+
+#~ msgid "Error ! You cannot create recursive Sales team."
+#~ msgstr "Fehler ! Sie können kein rekursives Sales Team haben."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "ungültiger Modulname in der Aktionsdefinition"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ 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 code of the sales team must be unique !"
+#~ msgstr "Die Kurzbezeichnung für das Vertriebsteam sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
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/el.po b/addons/document_ics/i18n/el.po
index 0edcfeb8fe4..5a2dcd7fd82 100644
--- a/addons/document_ics/i18n/el.po
+++ b/addons/document_ics/i18n/el.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-06-15 07:19+0000\n"
 "Last-Translator: Panagiotis Kranidiotis <kranidiotis@vatica.org>\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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -31,13 +31,6 @@ msgstr ""
 msgid "Object"
 msgstr "Αντικείμενο"
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες!"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -66,12 +59,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr "attendee"
+msgid "dtstamp"
+msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -94,11 +89,6 @@ msgstr "Συσκέψεις Κοινού Ημερολογίου"
 msgid "Manages an Helpdesk service."
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -206,9 +196,9 @@ msgid "location"
 msgstr "location"
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "attendee"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -357,17 +347,10 @@ msgstr "url"
 msgid "Business Opportunities"
 msgstr ""
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες!"
 
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Σφάλμα! Υπάρχει φάκελλος με ίδια περιγραφή."
@@ -381,5 +364,8 @@ msgstr ""
 #~ msgid "dt-stamp"
 #~ msgstr "dt-stamp"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
+
 #~ msgid "document.directory.ics.fields"
 #~ msgstr "document.directory.ics.fields"
diff --git a/addons/document_ics/i18n/es.po b/addons/document_ics/i18n/es.po
index 3daf353e06d..da3948f42e8 100644
--- a/addons/document_ics/i18n/es.po
+++ b/addons/document_ics/i18n/es.po
@@ -6,7 +6,7 @@ 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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-23 09:41+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -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-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -31,14 +31,6 @@ msgstr ""
 msgid "Object"
 msgstr "Objeto"
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -69,13 +61,17 @@ msgstr "Intervalo en horas"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr "asistente"
+msgid "dtstamp"
+msgstr "Marca fecha-hora (dtstamp)"
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
-msgstr "¡Error! No puede crear equipos de ventas recursivos."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
+msgstr ""
+"El campo del objeto usado en el nombre de fichero. Debe ser un identificador "
+"único."
 
 #. module: document_ics
 #: field:document.directory.ics.fields,content_id:0
@@ -97,11 +93,6 @@ msgstr "Reuniones de calendario compartidas"
 msgid "Manages an Helpdesk service."
 msgstr "Gestiona un servicio de asistencia/ayuda."
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de la acción."
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -201,11 +192,6 @@ msgstr "Campo OpenERP"
 msgid "ICS Calendar"
 msgstr "Calendario ICS"
 
-#. module: document_ics
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: document_ics
 #: field:document.directory.ics.fields,name:0
 msgid "ICS Value"
@@ -216,25 +202,15 @@ msgstr "Valor ICS"
 msgid "Expression as constant"
 msgstr "Expresión como constante"
 
-#. module: document_ics
-#: sql_constraint:crm.case.section:0
-msgid "The code of the sales team must be unique !"
-msgstr "¡El código del equipo de ventas debe ser único!"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "location"
 msgstr "ubicación"
 
 #. module: document_ics
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "asistente"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -386,24 +362,11 @@ msgstr "URL"
 msgid "Business Opportunities"
 msgstr "Oportunidades de negocio"
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr "Marca fecha-hora (dtstamp)"
-
-#. module: document_ics
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
-"El campo del objeto usado en el nombre de fichero. Debe ser un identificador "
-"único."
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
 
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "¡Error! No puede crear directorios recursivos."
@@ -411,6 +374,9 @@ msgstr ""
 #~ msgid "Open ERP Field"
 #~ msgstr "Campo OpenERP"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "document.directory.ics.fields"
 #~ msgstr "documento.directorio.ics.campos"
 
@@ -475,3 +441,21 @@ msgstr ""
 #~ msgstr ""
 #~ "Utilizado por las compañías para el seguimiento de errores y peticiones de "
 #~ "soporte sobre programas informáticos."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
+
+#~ msgid "Error ! You cannot create recursive Sales team."
+#~ msgstr "¡Error! No puede crear equipos de ventas recursivos."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The code of the sales team must be unique !"
+#~ msgstr "¡El código del equipo de ventas debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/document_ics/i18n/es_AR.po b/addons/document_ics/i18n/es_AR.po
index fceafa3b563..e66d898615b 100644
--- a/addons/document_ics/i18n/es_AR.po
+++ b/addons/document_ics/i18n/es_AR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-22 18:10+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,14 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr "Objeto"
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
-"especial!"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -66,12 +58,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr "asistente"
+msgid "dtstamp"
+msgstr "Fecha-sello"
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -94,11 +88,6 @@ msgstr "Reuniones de calendario compartidas"
 msgid "Manages an Helpdesk service."
 msgstr "Gestiona un servicio de mesa de ayuda."
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de la acción."
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -207,9 +196,9 @@ msgid "location"
 msgstr "ubicación"
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "asistente"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -358,18 +347,6 @@ msgstr "dirección"
 msgid "Business Opportunities"
 msgstr "Oportunidades de negocio"
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr "Fecha-sello"
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
-
 #~ msgid "Next"
 #~ msgstr "Siguiente"
 
@@ -382,6 +359,12 @@ msgstr ""
 #~ msgid "Open ERP Field"
 #~ msgstr "Campo OpenERP"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
+#~ "especial!"
+
 #~ msgid ""
 #~ "This Configuration step use to create Calendars in document for all Case "
 #~ "Sections"
@@ -407,6 +390,9 @@ msgstr ""
 #~ "o solicitudes pre-ventas, en el primer contacto con una solicitud del "
 #~ "cliente."
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para la definición de la vista!"
+
 #~ msgid "Duration(In Hour)"
 #~ msgstr "Duración (en horas)"
 
diff --git a/addons/document_ics/i18n/es_EC.po b/addons/document_ics/i18n/es_EC.po
index 64eddea4115..5443de0c7b4 100644
--- a/addons/document_ics/i18n/es_EC.po
+++ b/addons/document_ics/i18n/es_EC.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-17 19:09+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -29,14 +29,6 @@ msgstr ""
 msgid "Object"
 msgstr "Objeto"
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -67,12 +59,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr "asistente"
+msgid "dtstamp"
+msgstr "Marca fecha-hora (dtstamp)"
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -95,11 +89,6 @@ msgstr "Reuniones de calendario compartidas"
 msgid "Manages an Helpdesk service."
 msgstr "Gestiona un servicio de asistencia/ayuda."
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de la acción."
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -209,9 +198,9 @@ msgid "location"
 msgstr "ubicación"
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "asistente"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -359,15 +348,3 @@ msgstr "URL"
 #: field:document.ics.crm.wizard,opportunity:0
 msgid "Business Opportunities"
 msgstr "Oportunidades de negocio"
-
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr "Marca fecha-hora (dtstamp)"
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
diff --git a/addons/document_ics/i18n/et.po b/addons/document_ics/i18n/et.po
index 66a2988c975..f0445f45b10 100644
--- a/addons/document_ics/i18n/et.po
+++ b/addons/document_ics/i18n/et.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-06-08 17:44+0000\n"
 "Last-Translator: lyyser <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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,13 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr "Objekt"
 
-#. module: document_ics
-#: 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: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -64,12 +57,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr "kohalviibija"
+msgid "dtstamp"
+msgstr "dtstamp"
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -92,11 +87,6 @@ msgstr "Jagatud kalendri koosolekud"
 msgid "Manages an Helpdesk service."
 msgstr "Haldab helpdesk teenust."
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -204,9 +194,9 @@ msgid "location"
 msgstr "asukoht"
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "kohalviibija"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -355,17 +345,10 @@ msgstr "url"
 msgid "Business Opportunities"
 msgstr "Äri võimalused"
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr "dtstamp"
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
+#~ 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 "Error! You can not create recursive Directories."
 #~ msgstr "Viga! Sa ei saa luua regrussiivseid kaustu."
@@ -373,6 +356,12 @@ msgstr ""
 #~ msgid "Open ERP Field"
 #~ msgstr "Open ERO väli"
 
+#~ 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 "Used by companies to track bugs and support requests on softwares"
 #~ msgstr "Kasutatakse ettevõttes jälgimaks vigu ja pakkumaks tuge tarkvarale"
 
diff --git a/addons/document_ics/i18n/fi.po b/addons/document_ics/i18n/fi.po
index a05bdaa4abc..0498624ad13 100644
--- a/addons/document_ics/i18n/fi.po
+++ b/addons/document_ics/i18n/fi.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 03:48+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: Finnish <fi@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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -29,12 +29,6 @@ msgstr ""
 msgid "Object"
 msgstr "Objekti"
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -63,12 +57,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr "osallistuja"
+msgid "dtstamp"
+msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -91,11 +87,6 @@ msgstr "Kalenterin jaetut tapaamiset"
 msgid "Manages an Helpdesk service."
 msgstr "Hallinnoi Helpdesk-palvelua."
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -203,9 +194,9 @@ msgid "location"
 msgstr "sijainti"
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Virheellinen XML näkymäarkkitehtuurille!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "osallistuja"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -354,26 +345,21 @@ msgstr "URL"
 msgid "Business Opportunities"
 msgstr "Liiketoimintamahdollisuudet"
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
-
 #~ msgid "Next"
 #~ msgstr "Seuraava"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
+
 #~ msgid "Used by companies to track bugs and support requests on softwares"
 #~ msgstr ""
 #~ "Yritykset käyttävät ohjelmointivirheiden ja ohjelmien tukipyyntöjen "
 #~ "jäljittämiseen"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
+
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Virhe! Et voi luoda rekursiivisia kansioita."
 
@@ -387,6 +373,9 @@ msgstr ""
 #~ msgid "Error ! You cannot create recursive sections."
 #~ msgstr "Virhe! Et voi luoda rekursiivisia osioita."
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Virheellinen XML näkymäarkkitehtuurille!"
+
 #~ msgid "Duration(In Hour)"
 #~ msgstr "Kesto tunneissa"
 
diff --git a/addons/document_ics/i18n/fr.po b/addons/document_ics/i18n/fr.po
index 162f8445c42..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-14 05:29+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_ics/i18n/hr.po b/addons/document_ics/i18n/hr.po
index ebd13946a39..bfab7eccf3c 100644
--- a/addons/document_ics/i18n/hr.po
+++ b/addons/document_ics/i18n/hr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 03:48+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,13 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr "Objekt"
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -65,12 +58,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr "prisutan"
+msgid "dtstamp"
+msgstr "dtstamp"
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -93,11 +88,6 @@ msgstr "Sastanci zajedničkog kalendara"
 msgid "Manages an Helpdesk service."
 msgstr "Upravlja helpdesk uslugom"
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nevažeće ime modela u definiciji akcije."
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -205,9 +195,9 @@ msgid "location"
 msgstr "lokacija"
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za Arhitekturu Prikaza!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "prisutan"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -356,17 +346,8 @@ msgstr "url"
 msgid "Business Opportunities"
 msgstr "Poslovne prilike"
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr "dtstamp"
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nevažeći XML za Arhitekturu Prikaza!"
 
 #~ msgid "Next"
 #~ msgstr "Dalje"
@@ -380,6 +361,11 @@ msgstr ""
 #~ msgid "Open ERP Field"
 #~ msgstr "Open ERP polje"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
+
 #~ msgid ""
 #~ "This Configuration step use to create Calendars in document for all Case "
 #~ "Sections"
@@ -391,6 +377,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Korišten od tvrtki za praćenje pogrešaka i zahtjeva za podrškom na programima"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nevažeće ime modela u definiciji akcije."
+
 #~ msgid ""
 #~ "Help you to organise the jobs hiring process: evaluation, meetings, email "
 #~ "integration..."
diff --git a/addons/document_ics/i18n/hu.po b/addons/document_ics/i18n/hu.po
index c6ac3fa8d16..51d814609fc 100644
--- a/addons/document_ics/i18n/hu.po
+++ b/addons/document_ics/i18n/hu.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,12 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -62,12 +56,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
+msgid "dtstamp"
 msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -90,11 +86,6 @@ msgstr ""
 msgid "Manages an Helpdesk service."
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -202,8 +193,8 @@ msgid "location"
 msgstr ""
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
 msgstr ""
 
 #. module: document_ics
@@ -352,15 +343,3 @@ msgstr ""
 #: field:document.ics.crm.wizard,opportunity:0
 msgid "Business Opportunities"
 msgstr ""
-
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
diff --git a/addons/document_ics/i18n/id.po b/addons/document_ics/i18n/id.po
index 63356b5b2cc..4f25f92c483 100644
--- a/addons/document_ics/i18n/id.po
+++ b/addons/document_ics/i18n/id.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-16 10:46+0000\n"
 "Last-Translator: <>\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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,12 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -62,12 +56,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
+msgid "dtstamp"
 msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -90,11 +86,6 @@ msgstr ""
 msgid "Manages an Helpdesk service."
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -202,8 +193,8 @@ msgid "location"
 msgstr ""
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
 msgstr ""
 
 #. module: document_ics
@@ -352,15 +343,3 @@ msgstr ""
 #: field:document.ics.crm.wizard,opportunity:0
 msgid "Business Opportunities"
 msgstr ""
-
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
diff --git a/addons/document_ics/i18n/it.po b/addons/document_ics/i18n/it.po
index 253ffbf84ef..17cd6cbce6b 100644
--- a/addons/document_ics/i18n/it.po
+++ b/addons/document_ics/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-22 07: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-11-23 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,14 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr "Oggetto"
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -66,12 +58,14 @@ msgstr "Intervallo in ore"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr "partecipante"
+msgid "dtstamp"
+msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -94,11 +88,6 @@ msgstr "Condividi il Calendario Riunioni"
 msgid "Manages an Helpdesk service."
 msgstr "Gestisci un servizio di Helpdesk"
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome del modello non valido nella definizione dell'azione."
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -190,11 +179,6 @@ msgstr "Campo OpenERP"
 msgid "ICS Calendar"
 msgstr "Calendario ICS"
 
-#. module: document_ics
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere unico!"
-
 #. module: document_ics
 #: field:document.directory.ics.fields,name:0
 msgid "ICS Value"
@@ -205,25 +189,15 @@ msgstr "Valore ICS"
 msgid "Expression as constant"
 msgstr "Espressione come costante"
 
-#. module: document_ics
-#: sql_constraint:crm.case.section:0
-msgid "The code of the sales team must be unique !"
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "location"
 msgstr "posizione"
 
 #. module: document_ics
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "L'ID certificato del modulo deve essere unico!"
-
-#. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "partecipante"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -372,22 +346,14 @@ msgstr "URL"
 msgid "Business Opportunities"
 msgstr "Opportunità"
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
 
-#. module: document_ics
-#: 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!"
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per Visualizzazione Architettura!"
 
 #~ msgid "Next"
 #~ msgstr "Prossimo"
@@ -413,6 +379,9 @@ msgstr ""
 #~ "Usato dalle aziende per tener traccia di errori e rispondere alle richieste "
 #~ "sui software"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome del modello non valido nella definizione dell'azione."
+
 #~ msgid ""
 #~ "Help you to organise the jobs hiring process: evaluation, meetings, email "
 #~ "integration..."
@@ -460,3 +429,12 @@ msgstr ""
 
 #~ msgid "document.directory.ics.fields"
 #~ msgstr "Copy text   \t document.directory.ics.fields"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "L'ID certificato del modulo deve essere unico!"
+
+#~ 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/document_ics/i18n/ko.po b/addons/document_ics/i18n/ko.po
index ab66ce95483..80dc404b7c7 100644
--- a/addons/document_ics/i18n/ko.po
+++ b/addons/document_ics/i18n/ko.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-08 13:00+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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -29,12 +29,6 @@ msgstr ""
 msgid "Object"
 msgstr "오브젝트"
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -63,12 +57,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr "참석자"
+msgid "dtstamp"
+msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -91,11 +87,6 @@ msgstr "공유된 카렌더 미팅들"
 msgid "Manages an Helpdesk service."
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -203,9 +194,9 @@ msgid "location"
 msgstr "위치"
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "참석자"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -354,18 +345,6 @@ msgstr ""
 msgid "Business Opportunities"
 msgstr ""
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
-
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "에러! 재귀적 디렉토리는 생성할 수 없습니다."
 
diff --git a/addons/document_ics/i18n/lt.po b/addons/document_ics/i18n/lt.po
index 1329abb3aff..59a87d1fcbc 100644
--- a/addons/document_ics/i18n/lt.po
+++ b/addons/document_ics/i18n/lt.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-08 12:55+0000\n"
 "Last-Translator: Donatas Stonys TeraxIT <donatelonow@hotmail.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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,12 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -62,12 +56,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
+msgid "dtstamp"
 msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -90,11 +86,6 @@ msgstr ""
 msgid "Manages an Helpdesk service."
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -202,8 +193,8 @@ msgid "location"
 msgstr ""
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
 msgstr ""
 
 #. module: document_ics
@@ -352,15 +343,3 @@ msgstr ""
 #: field:document.ics.crm.wizard,opportunity:0
 msgid "Business Opportunities"
 msgstr ""
-
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
diff --git a/addons/document_ics/i18n/mn.po b/addons/document_ics/i18n/mn.po
index 84c631bbc79..b622522e2a2 100644
--- a/addons/document_ics/i18n/mn.po
+++ b/addons/document_ics/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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-29 10:43+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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -29,14 +29,6 @@ msgstr ""
 msgid "Object"
 msgstr "Объект"
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-"болохгүй!"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -65,12 +57,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr "оролцогч"
+msgid "dtstamp"
+msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -93,11 +87,6 @@ msgstr ""
 msgid "Manages an Helpdesk service."
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -205,9 +194,9 @@ msgid "location"
 msgstr "байршил"
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Дэлгэцийн XML алдаатай!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "оролцогч"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -356,18 +345,6 @@ msgstr ""
 msgid "Business Opportunities"
 msgstr "Бизнес боломжууд"
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
-
 #~ msgid "Next"
 #~ msgstr "Дараах"
 
@@ -377,9 +354,21 @@ msgstr ""
 #~ msgid "Open ERP Field"
 #~ msgstr "Open ERP талбар"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+#~ "болохгүй!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+
 #~ msgid "Error ! You cannot create recursive sections."
 #~ msgstr "Алдаа ! Рекурсив хэсэг үүсгэж болохгүй."
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Дэлгэцийн XML алдаатай!"
+
 #~ msgid "Prospect"
 #~ msgstr "Ирээдүйн"
 
diff --git a/addons/document_ics/i18n/nl.po b/addons/document_ics/i18n/nl.po
index 9e409b71cdd..c510f339b93 100644
--- a/addons/document_ics/i18n/nl.po
+++ b/addons/document_ics/i18n/nl.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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-12-01 07:01+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-02 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -30,13 +30,6 @@ msgstr ""
 msgid "Object"
 msgstr "Object"
 
-#. module: document_ics
-#: 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: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -65,13 +58,17 @@ msgstr "Interval in uren"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr "deelnemer"
+msgid "dtstamp"
+msgstr "datum/tijd"
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
-msgstr "Fout ! U kunt geen recursief verkoopteam maken."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
+msgstr ""
+"Het veld van het object wordt gebruikt als bestandsnaam. Moet een unieke "
+"identifier zijn."
 
 #. module: document_ics
 #: field:document.directory.ics.fields,content_id:0
@@ -93,11 +90,6 @@ msgstr "Gedeelde agenda vergaderingen"
 msgid "Manages an Helpdesk service."
 msgstr "Beheert een helpdesk-dienst."
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de actie-definitie."
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -195,11 +187,6 @@ msgstr "OpenERP veld"
 msgid "ICS Calendar"
 msgstr "ICS-agenda"
 
-#. module: document_ics
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "De modulenaam moet uniek zijn !"
-
 #. module: document_ics
 #: field:document.directory.ics.fields,name:0
 msgid "ICS Value"
@@ -210,25 +197,15 @@ msgstr "ICS-waarde"
 msgid "Expression as constant"
 msgstr "Expressie als constante"
 
-#. module: document_ics
-#: sql_constraint:crm.case.section:0
-msgid "The code of the sales team must be unique !"
-msgstr "De verkoopteam code moet uniek zijn!"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "location"
 msgstr "locatie"
 
 #. module: document_ics
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "deelnemer"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -382,25 +359,6 @@ msgstr "url"
 msgid "Business Opportunities"
 msgstr "Zakelijke kansen"
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr "datum/tijd"
-
-#. module: document_ics
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
-"Het veld van het object wordt gebruikt als bestandsnaam. Moet een unieke "
-"identifier zijn."
-
 #~ msgid "Open ERP Field"
 #~ msgstr "OpenERP veld"
 
@@ -410,11 +368,19 @@ msgstr ""
 #~ msgid "Configure Calendars for CRM Sections"
 #~ msgstr "Configureer agenda's voor CRM-secties"
 
+#~ 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 "Used by companies to track bugs and support requests on softwares"
 #~ msgstr ""
 #~ "Gebruikt door bedrijven om foutrapporten en ondersteuningsverzoeken op "
 #~ "software te volgen."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ongeldige modelnaam in de actie-definitie."
+
 #~ msgid ""
 #~ "Help you to organise the jobs hiring process: evaluation, meetings, email "
 #~ "integration..."
@@ -439,6 +405,9 @@ msgstr ""
 #~ "Beheert de claims van leveranciers en klanten, inclusief uw corrigerende of "
 #~ "preventieve acties."
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML voor weergave!"
+
 #~ msgid "Duration(In Hour)"
 #~ msgstr "Duur (in uren)"
 
@@ -470,3 +439,18 @@ msgstr ""
 
 #~ msgid "document.directory.ics.fields"
 #~ msgstr "document.directory.ics.fields"
+
+#~ msgid "Error ! You cannot create recursive Sales team."
+#~ msgstr "Fout ! U kunt geen recursief verkoopteam maken."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
+
+#~ msgid "The code of the sales team must be unique !"
+#~ msgstr "De verkoopteam code moet uniek zijn!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/document_ics/i18n/nl_BE.po b/addons/document_ics/i18n/nl_BE.po
index bac29e33880..c76b8201fb7 100644
--- a/addons/document_ics/i18n/nl_BE.po
+++ b/addons/document_ics/i18n/nl_BE.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-04-24 15:00+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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,13 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr ""
 
-#. module: document_ics
-#: 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 karakters bevatten !"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -63,12 +56,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
+msgid "dtstamp"
 msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -91,11 +86,6 @@ msgstr ""
 msgid "Manages an Helpdesk service."
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -203,8 +193,8 @@ msgid "location"
 msgstr ""
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
 msgstr ""
 
 #. module: document_ics
@@ -354,14 +344,7 @@ msgstr ""
 msgid "Business Opportunities"
 msgstr ""
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
+#~ 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 karakters bevatten !"
diff --git a/addons/document_ics/i18n/pl.po b/addons/document_ics/i18n/pl.po
index b7be4f41690..c69199421d6 100644
--- a/addons/document_ics/i18n/pl.po
+++ b/addons/document_ics/i18n/pl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-29 11:14+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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,14 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr "Obiekt"
 
-#. module: document_ics
-#: 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: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -64,12 +56,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr ""
+msgid "dtstamp"
+msgstr "dtstamp"
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -92,11 +86,6 @@ msgstr "Spotkania we współdzielonym kalendarzu"
 msgid "Manages an Helpdesk service."
 msgstr "Zarządza usługą Helpdesku."
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -205,9 +194,9 @@ msgid "location"
 msgstr "lokalizacja"
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr ""
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -356,17 +345,14 @@ msgstr "url"
 msgid "Business Opportunities"
 msgstr "Szanse biznesowe"
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr "dtstamp"
+#~ 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: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Błąd! Nie możesz tworzyć rekurencyjnych katalogów."
@@ -380,6 +366,9 @@ msgstr ""
 #~ msgid "Next"
 #~ msgstr "Następne"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
 #~ msgid "Configure Calendars for CRM Sections"
 #~ msgstr "Konfiguruj kalendarze dla sekcji CRM"
 
diff --git a/addons/document_ics/i18n/pt.po b/addons/document_ics/i18n/pt.po
index 4eadb239549..d2f0ac55b24 100644
--- a/addons/document_ics/i18n/pt.po
+++ b/addons/document_ics/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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/pt_BR.po b/addons/document_ics/i18n/pt_BR.po
index 54eace4b4a2..7223a0829b0 100644
--- a/addons/document_ics/i18n/pt_BR.po
+++ b/addons/document_ics/i18n/pt_BR.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-16 15: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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,14 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-"especial!"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -64,12 +56,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
+msgid "dtstamp"
 msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -92,11 +86,6 @@ msgstr ""
 msgid "Manages an Helpdesk service."
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -204,9 +193,9 @@ msgid "location"
 msgstr ""
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr ""
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -355,14 +344,11 @@ msgstr ""
 msgid "Business Opportunities"
 msgstr ""
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
+#~ "especial!"
 
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalido XML para Arquitetura da View"
diff --git a/addons/document_ics/i18n/ro.po b/addons/document_ics/i18n/ro.po
index 69f1ebb235e..18667226bf3 100644
--- a/addons/document_ics/i18n/ro.po
+++ b/addons/document_ics/i18n/ro.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,12 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -62,12 +56,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr "participant"
+msgid "dtstamp"
+msgstr "dtstamp"
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -90,11 +86,6 @@ msgstr ""
 msgid "Manages an Helpdesk service."
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -202,9 +193,9 @@ msgid "location"
 msgstr ""
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "participant"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -353,18 +344,6 @@ msgstr ""
 msgid "Business Opportunities"
 msgstr "Oportunități de afaceri"
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr "dtstamp"
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
-
 #~ msgid "Used by companies to track bugs and support requests on softwares"
 #~ msgstr ""
 #~ "Folosit de companii pentru a urmari defecte si a oferi suport pentru "
diff --git a/addons/document_ics/i18n/ru.po b/addons/document_ics/i18n/ru.po
index 4df4b1dc089..ab3f31354b9 100644
--- a/addons/document_ics/i18n/ru.po
+++ b/addons/document_ics/i18n/ru.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 03:50+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,14 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr "Объект"
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -64,12 +56,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
+msgid "dtstamp"
 msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -92,11 +86,6 @@ msgstr ""
 msgid "Manages an Helpdesk service."
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -204,9 +193,9 @@ msgid "location"
 msgstr "местоположение"
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr ""
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -355,17 +344,17 @@ msgstr "адрес URL"
 msgid "Business Opportunities"
 msgstr "Возможные сделки"
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
 
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра архитектуры!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Недопустимое имя модели в определении действия"
 
 #~ msgid "Next"
 #~ msgstr "Далее"
diff --git a/addons/document_ics/i18n/sl.po b/addons/document_ics/i18n/sl.po
index 4d676dc4407..7d354b01c3f 100644
--- a/addons/document_ics/i18n/sl.po
+++ b/addons/document_ics/i18n/sl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 03:51+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,13 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr "Predmet"
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -63,12 +56,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
+msgid "dtstamp"
 msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -91,11 +86,6 @@ msgstr ""
 msgid "Manages an Helpdesk service."
 msgstr "Upravlja s storitvijo pomoči uporabnikom"
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Napačno ime modela v definiciji dejanja."
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -203,9 +193,9 @@ msgid "location"
 msgstr "lokacijo"
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr ""
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -354,17 +344,13 @@ msgstr "url"
 msgid "Business Opportunities"
 msgstr "Poslovne priložnosti"
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
 
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda."
 
 #~ msgid "Next"
 #~ msgstr "Naslednji"
@@ -381,6 +367,9 @@ msgstr ""
 #~ msgid "Used by companies to track bugs and support requests on softwares"
 #~ msgstr "Uporabljajo programerska podjetja za sledenje napakam in zahtevkom"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Napačno ime modela v definiciji dejanja."
+
 #~ msgid "Open ERP Field"
 #~ msgstr "Polje OpenERP"
 
diff --git a/addons/document_ics/i18n/sq.po b/addons/document_ics/i18n/sq.po
index 4971f205f10..8c75f354c6a 100644
--- a/addons/document_ics/i18n/sq.po
+++ b/addons/document_ics/i18n/sq.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -29,12 +29,6 @@ msgstr ""
 msgid "Object"
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -63,12 +57,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
+msgid "dtstamp"
 msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -91,11 +87,6 @@ msgstr ""
 msgid "Manages an Helpdesk service."
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -203,8 +194,8 @@ msgid "location"
 msgstr ""
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
 msgstr ""
 
 #. module: document_ics
@@ -353,15 +344,3 @@ msgstr ""
 #: field:document.ics.crm.wizard,opportunity:0
 msgid "Business Opportunities"
 msgstr ""
-
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
diff --git a/addons/document_ics/i18n/sr.po b/addons/document_ics/i18n/sr.po
index af5b02acfc8..40435d465d1 100644
--- a/addons/document_ics/i18n/sr.po
+++ b/addons/document_ics/i18n/sr.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-03 07:57+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-04 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -31,13 +31,6 @@ msgstr ""
 msgid "Object"
 msgstr "Objekat"
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -68,13 +61,17 @@ msgstr "Interval u Casovima"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr "prisutan"
+msgid "dtstamp"
+msgstr "dtstamp"
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
-msgstr "Greska ! Ne mozes kreirati rekursivni Prodajni tim."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
+msgstr ""
+"Polje objekta koriscenom u Imenu Fajla. Ovo mora biti jedinstveni "
+"identifikator."
 
 #. module: document_ics
 #: field:document.directory.ics.fields,content_id:0
@@ -96,11 +93,6 @@ msgstr "Sastanci zajedničkog kalendara"
 msgid "Manages an Helpdesk service."
 msgstr "Upravlja uslugom Helpdesk-a."
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Pogrešno ime modela u definiciji akcije."
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -214,9 +206,9 @@ msgid "location"
 msgstr "polozaj"
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za pregled arhitekture"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "prisutan"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -368,20 +360,6 @@ msgstr "url"
 msgid "Business Opportunities"
 msgstr "Poslovne Prilike"
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr "dtstamp"
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
-"Polje objekta koriscenom u Imenu Fajla. Ovo mora biti jedinstveni "
-"identifikator."
-
 #~ msgid "Next"
 #~ msgstr "Sledeće"
 
@@ -391,6 +369,11 @@ msgstr ""
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Greška! Ne možete kreirati rekurzivne direktorijume."
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
 #~ msgid "Open ERP Field"
 #~ msgstr "Otvori ERP Polje"
 
@@ -405,6 +388,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Korišten od firmi za praćenje grešaka i zahteva za podrškom na programima"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Pogrešno ime modela u definiciji akcije."
+
 #~ msgid ""
 #~ "Help you to organise the jobs hiring process: evaluation, meetings, email "
 #~ "integration..."
@@ -429,6 +415,9 @@ msgstr ""
 #~ "Upravlja pritužbama dobavljača i kupaca, uključujući korektivne ili "
 #~ "preventivne akcije."
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nevažeći XML za pregled arhitekture"
+
 #~ msgid "Duration(In Hour)"
 #~ msgstr "Trajanje (u satima)"
 
@@ -450,3 +439,6 @@ msgstr ""
 
 #~ msgid "document.directory.ics.fields"
 #~ msgstr "document.directory.ics.fields"
+
+#~ msgid "Error ! You cannot create recursive Sales team."
+#~ msgstr "Greska ! Ne mozes kreirati rekursivni Prodajni tim."
diff --git a/addons/document_ics/i18n/sr@latin.po b/addons/document_ics/i18n/sr@latin.po
index 4e95ecb6002..d37342f6142 100644
--- a/addons/document_ics/i18n/sr@latin.po
+++ b/addons/document_ics/i18n/sr@latin.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/sv.po b/addons/document_ics/i18n/sv.po
index 7ed582c18b3..f1b64f0706b 100644
--- a/addons/document_ics/i18n/sv.po
+++ b/addons/document_ics/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-22 20:31+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <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-11-23 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,13 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr "Object"
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -64,12 +57,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr "attendee"
+msgid "dtstamp"
+msgstr "dtstamp"
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -92,11 +87,6 @@ msgstr ""
 msgid "Manages an Helpdesk service."
 msgstr "Manages an Helpdesk service."
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Invalid model name in the action definition."
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -188,11 +178,6 @@ msgstr ""
 msgid "ICS Calendar"
 msgstr "ICS Calendar"
 
-#. module: document_ics
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: document_ics
 #: field:document.directory.ics.fields,name:0
 msgid "ICS Value"
@@ -203,25 +188,15 @@ msgstr "ICS Value"
 msgid "Expression as constant"
 msgstr ""
 
-#. module: document_ics
-#: sql_constraint:crm.case.section:0
-msgid "The code of the sales team must be unique !"
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "location"
 msgstr "location"
 
 #. module: document_ics
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "attendee"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -370,22 +345,10 @@ msgstr "url"
 msgid "Business Opportunities"
 msgstr "Business Opportunities"
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr "dtstamp"
-
-#. module: document_ics
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
 #~ msgid "Configure Calendars for CRM Sections"
 #~ msgstr "Configure Calendars for CRM Sections"
@@ -399,6 +362,9 @@ msgstr ""
 #~ msgid "document.directory.ics.fields"
 #~ msgstr "document.directory.ics.fields"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Invalid model name in the action definition."
+
 #~ msgid "Used by companies to track bugs and support requests on softwares"
 #~ msgstr "Used by companies to track bugs and support requests on softwares"
 
@@ -416,6 +382,9 @@ msgstr ""
 #~ "Help you to organise the jobs hiring process: evaluation, meetings, email "
 #~ "integration..."
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalid XML for View Architecture!"
+
 #~ msgid ""
 #~ "Allows you to track and manage prospects which are pre-sales requests or "
 #~ "contacts, the very first contact with a customer request."
diff --git a/addons/document_ics/i18n/tlh.po b/addons/document_ics/i18n/tlh.po
index 05e869c0a46..efbe4f0e73f 100644
--- a/addons/document_ics/i18n/tlh.po
+++ b/addons/document_ics/i18n/tlh.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,12 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -62,12 +56,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
+msgid "dtstamp"
 msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -90,11 +86,6 @@ msgstr ""
 msgid "Manages an Helpdesk service."
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -202,8 +193,8 @@ msgid "location"
 msgstr ""
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
 msgstr ""
 
 #. module: document_ics
@@ -352,15 +343,3 @@ msgstr ""
 #: field:document.ics.crm.wizard,opportunity:0
 msgid "Business Opportunities"
 msgstr ""
-
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
diff --git a/addons/document_ics/i18n/tr.po b/addons/document_ics/i18n/tr.po
index 038d9bcf5a6..dd5253a148f 100644
--- a/addons/document_ics/i18n/tr.po
+++ b/addons/document_ics/i18n/tr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-09 07:18+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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,12 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr "Nesne"
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -62,12 +56,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
+msgid "dtstamp"
 msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -90,11 +86,6 @@ msgstr "Paylaşılan Toplantı Takvimi"
 msgid "Manages an Helpdesk service."
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -202,9 +193,9 @@ msgid "location"
 msgstr "Lokasyon"
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr ""
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -353,17 +344,8 @@ msgstr ""
 msgid "Business Opportunities"
 msgstr "İş Fırsatları"
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
 
 #~ msgid "Duration(In Hour)"
 #~ msgstr "Süre (Saat)"
diff --git a/addons/document_ics/i18n/uk.po b/addons/document_ics/i18n/uk.po
index d01ac8b92bf..521a7f2f054 100644
--- a/addons/document_ics/i18n/uk.po
+++ b/addons/document_ics/i18n/uk.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-08 14:51+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,13 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -63,12 +56,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
+msgid "dtstamp"
 msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -91,11 +86,6 @@ msgstr ""
 msgid "Manages an Helpdesk service."
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -203,9 +193,9 @@ msgid "location"
 msgstr ""
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури Вигляду!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr ""
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -354,14 +344,10 @@ msgstr ""
 msgid "Business Opportunities"
 msgstr ""
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
 
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильний XML для Архітектури Вигляду!"
diff --git a/addons/document_ics/i18n/vi.po b/addons/document_ics/i18n/vi.po
index f06315efc47..3f0dc415956 100644
--- a/addons/document_ics/i18n/vi.po
+++ b/addons/document_ics/i18n/vi.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -29,12 +29,6 @@ msgstr ""
 msgid "Object"
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -63,12 +57,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
+msgid "dtstamp"
 msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -91,11 +87,6 @@ msgstr ""
 msgid "Manages an Helpdesk service."
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -203,8 +194,8 @@ msgid "location"
 msgstr ""
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
 msgstr ""
 
 #. module: document_ics
@@ -353,15 +344,3 @@ msgstr ""
 #: field:document.ics.crm.wizard,opportunity:0
 msgid "Business Opportunities"
 msgstr ""
-
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
diff --git a/addons/document_ics/i18n/zh_CN.po b/addons/document_ics/i18n/zh_CN.po
index 6a8d1acfde9..7efcc819f01 100644
--- a/addons/document_ics/i18n/zh_CN.po
+++ b/addons/document_ics/i18n/zh_CN.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-09 07:18+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,12 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr "对象"
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -62,12 +56,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr "出勤者"
+msgid "dtstamp"
+msgstr "标记"
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -90,11 +86,6 @@ msgstr "共享的会议日程表"
 msgid "Manages an Helpdesk service."
 msgstr "管理帮助平台服务"
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "在动作定义中使用了无效的模快名。"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -202,9 +193,9 @@ msgid "location"
 msgstr "位置"
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效的视图结构xml文件!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "出勤者"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -353,21 +344,13 @@ msgstr "信息地址（url）"
 msgid "Business Opportunities"
 msgstr "商机"
 
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr "标记"
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
-
 #~ msgid "Open ERP Field"
 #~ msgstr "系统字段"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+
 #~ msgid "Create Pre-Configured Calendars"
 #~ msgstr "创建预先设置的日程表"
 
@@ -412,6 +395,9 @@ msgstr ""
 #~ "Sections"
 #~ msgstr "这设置步骤用于创建所有划分的业务个案的日程表"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "在动作定义中使用了无效的模快名。"
+
 #~ msgid "Error ! You cannot create recursive sections."
 #~ msgstr "错误！你不能创建递归的细项"
 
@@ -424,3 +410,6 @@ msgstr ""
 #~ "Manages the supplier and customers claims, including your corrective or "
 #~ "preventive actions."
 #~ msgstr "管理客户和供应商的索赔, 包括您的纠正或预防措施"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效的视图结构xml文件!"
diff --git a/addons/document_ics/i18n/zh_TW.po b/addons/document_ics/i18n/zh_TW.po
index 3648712278a..8b7803224bf 100644
--- a/addons/document_ics/i18n/zh_TW.po
+++ b/addons/document_ics/i18n/zh_TW.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-01-23 17:18+0000\n"
 "Last-Translator: <>\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-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,12 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -62,12 +56,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
+msgid "dtstamp"
 msgstr ""
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -90,11 +86,6 @@ msgstr ""
 msgid "Manages an Helpdesk service."
 msgstr ""
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
@@ -202,8 +193,8 @@ msgid "location"
 msgstr ""
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
 msgstr ""
 
 #. module: document_ics
@@ -352,15 +343,3 @@ msgstr ""
 #: field:document.ics.crm.wizard,opportunity:0
 msgid "Business Opportunities"
 msgstr ""
-
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
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 626f05bf829..6aa8e28019b 100644
--- a/addons/email_template/i18n/it.po
+++ b/addons/email_template/i18n/it.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-11-24 08:22+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\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-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
@@ -1087,7 +1088,7 @@ msgstr ""
 #: field:email.template,def_to:0
 #: field:email_template.mailbox,email_to:0
 msgid "Recipient (To)"
-msgstr "Recipiente (A)"
+msgstr "Destinatario (A)"
 
 #. module: email_template
 #: field:email.template,null_value:0
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/fetchmail/i18n/pt.po b/addons/fetchmail/i18n/pt.po
index 5bd2230584d..49b9827e835 100644
--- a/addons/fetchmail/i18n/pt.po
+++ b/addons/fetchmail/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:16+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2010-12-14 23:19+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:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: fetchmail
diff --git a/addons/google_map/i18n/ar.po b/addons/google_map/i18n/ar.po
index f1202d5b596..739589aa0dc 100644
--- a/addons/google_map/i18n/ar.po
+++ b/addons/google_map/i18n/ar.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/bg.po b/addons/google_map/i18n/bg.po
index 975e4c80b36..a3bfa4716e2 100644
--- a/addons/google_map/i18n/bg.po
+++ b/addons/google_map/i18n/bg.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/br.po b/addons/google_map/i18n/br.po
index 7d88190c898..b2b49c6003d 100644
--- a/addons/google_map/i18n/br.po
+++ b/addons/google_map/i18n/br.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/bs.po b/addons/google_map/i18n/bs.po
index 5414b0c7155..43e75dea9fe 100644
--- a/addons/google_map/i18n/bs.po
+++ b/addons/google_map/i18n/bs.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/ca.po b/addons/google_map/i18n/ca.po
index 1931f2d2ad4..91d1eed6219 100644
--- a/addons/google_map/i18n/ca.po
+++ b/addons/google_map/i18n/ca.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/cs.po b/addons/google_map/i18n/cs.po
index d1e2cab8adc..ef17763f3bd 100644
--- a/addons/google_map/i18n/cs.po
+++ b/addons/google_map/i18n/cs.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/da.po b/addons/google_map/i18n/da.po
index 87cead72cbc..b4dbfbcb328 100644
--- a/addons/google_map/i18n/da.po
+++ b/addons/google_map/i18n/da.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/de.po b/addons/google_map/i18n/de.po
index c598cc5ef3e..27ae3134e6c 100644
--- a/addons/google_map/i18n/de.po
+++ b/addons/google_map/i18n/de.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/el.po b/addons/google_map/i18n/el.po
index 430eb7cefa9..76332a86409 100644
--- a/addons/google_map/i18n/el.po
+++ b/addons/google_map/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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/es.po b/addons/google_map/i18n/es.po
index 776a70142e8..6cf8c3c65e6 100644
--- a/addons/google_map/i18n/es.po
+++ b/addons/google_map/i18n/es.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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/es_AR.po b/addons/google_map/i18n/es_AR.po
index 01839759b38..65ee2c32e43 100644
--- a/addons/google_map/i18n/es_AR.po
+++ b/addons/google_map/i18n/es_AR.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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/es_EC.po b/addons/google_map/i18n/es_EC.po
index 544f6664fa2..b67d7a79110 100644
--- a/addons/google_map/i18n/es_EC.po
+++ b/addons/google_map/i18n/es_EC.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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/et.po b/addons/google_map/i18n/et.po
index 477722b126d..bda01486d9b 100644
--- a/addons/google_map/i18n/et.po
+++ b/addons/google_map/i18n/et.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/eu.po b/addons/google_map/i18n/eu.po
index 2791f9f40bf..77cdc38005e 100644
--- a/addons/google_map/i18n/eu.po
+++ b/addons/google_map/i18n/eu.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/fi.po b/addons/google_map/i18n/fi.po
index d9982d23c2f..ce27d69f220 100644
--- a/addons/google_map/i18n/fi.po
+++ b/addons/google_map/i18n/fi.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/fr.po b/addons/google_map/i18n/fr.po
index cb81e0e37c1..996a20cf3a9 100644
--- a/addons/google_map/i18n/fr.po
+++ b/addons/google_map/i18n/fr.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/gl.po b/addons/google_map/i18n/gl.po
index a753b865634..596c60d0f24 100644
--- a/addons/google_map/i18n/gl.po
+++ b/addons/google_map/i18n/gl.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
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/hi.po b/addons/google_map/i18n/hi.po
index 0c97190f782..915e5da26aa 100644
--- a/addons/google_map/i18n/hi.po
+++ b/addons/google_map/i18n/hi.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/hr.po b/addons/google_map/i18n/hr.po
index 3e4bf4dedb4..a290c1e262d 100644
--- a/addons/google_map/i18n/hr.po
+++ b/addons/google_map/i18n/hr.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/hu.po b/addons/google_map/i18n/hu.po
index 7a4210b921d..81a7003d04d 100644
--- a/addons/google_map/i18n/hu.po
+++ b/addons/google_map/i18n/hu.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/id.po b/addons/google_map/i18n/id.po
index 2530001caa8..0ea73cf5a19 100644
--- a/addons/google_map/i18n/id.po
+++ b/addons/google_map/i18n/id.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/it.po b/addons/google_map/i18n/it.po
index 263751fa9d7..6a941745182 100644
--- a/addons/google_map/i18n/it.po
+++ b/addons/google_map/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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/ko.po b/addons/google_map/i18n/ko.po
index f34af86d6e1..d5116acc313 100644
--- a/addons/google_map/i18n/ko.po
+++ b/addons/google_map/i18n/ko.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/lt.po b/addons/google_map/i18n/lt.po
index 31d37103c8b..7972aca2c2f 100644
--- a/addons/google_map/i18n/lt.po
+++ b/addons/google_map/i18n/lt.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/lv.po b/addons/google_map/i18n/lv.po
index a2754c08a4d..1d8477bacf8 100644
--- a/addons/google_map/i18n/lv.po
+++ b/addons/google_map/i18n/lv.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/mn.po b/addons/google_map/i18n/mn.po
index f85e7b6a91a..2442d6e2541 100644
--- a/addons/google_map/i18n/mn.po
+++ b/addons/google_map/i18n/mn.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/nl.po b/addons/google_map/i18n/nl.po
index f597deb3d1d..75fabbeee5e 100644
--- a/addons/google_map/i18n/nl.po
+++ b/addons/google_map/i18n/nl.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/nl_BE.po b/addons/google_map/i18n/nl_BE.po
index 206aa5ae1b9..cce4f538998 100644
--- a/addons/google_map/i18n/nl_BE.po
+++ b/addons/google_map/i18n/nl_BE.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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/oc.po b/addons/google_map/i18n/oc.po
index 1d4976c81d0..331ec4ce44f 100644
--- a/addons/google_map/i18n/oc.po
+++ b/addons/google_map/i18n/oc.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/pl.po b/addons/google_map/i18n/pl.po
index ae2c81a0f6d..7325c2b5df4 100644
--- a/addons/google_map/i18n/pl.po
+++ b/addons/google_map/i18n/pl.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/pt.po b/addons/google_map/i18n/pt.po
index 3bb88f96990..644de6011e0 100644
--- a/addons/google_map/i18n/pt.po
+++ b/addons/google_map/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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/pt_BR.po b/addons/google_map/i18n/pt_BR.po
index c675433751d..5a89ae5c09c 100644
--- a/addons/google_map/i18n/pt_BR.po
+++ b/addons/google_map/i18n/pt_BR.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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/ro.po b/addons/google_map/i18n/ro.po
index ceb6e0b931c..50826cb4bd3 100644
--- a/addons/google_map/i18n/ro.po
+++ b/addons/google_map/i18n/ro.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/ru.po b/addons/google_map/i18n/ru.po
index fdc62d22bbc..9bf737b9ecc 100644
--- a/addons/google_map/i18n/ru.po
+++ b/addons/google_map/i18n/ru.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/sk.po b/addons/google_map/i18n/sk.po
index 9a400892cc2..de2a1815c00 100644
--- a/addons/google_map/i18n/sk.po
+++ b/addons/google_map/i18n/sk.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/sl.po b/addons/google_map/i18n/sl.po
index 93212b977a6..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-14 04:57+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/i18n/sq.po b/addons/google_map/i18n/sq.po
index e3189f49aba..67722c52f34 100644
--- a/addons/google_map/i18n/sq.po
+++ b/addons/google_map/i18n/sq.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/sr.po b/addons/google_map/i18n/sr.po
index d0dd88a5623..963f69ed980 100644
--- a/addons/google_map/i18n/sr.po
+++ b/addons/google_map/i18n/sr.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-14 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/sr@latin.po b/addons/google_map/i18n/sr@latin.po
index 7bf116a2800..62f5ce7de7e 100644
--- a/addons/google_map/i18n/sr@latin.po
+++ b/addons/google_map/i18n/sr@latin.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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/sv.po b/addons/google_map/i18n/sv.po
index 7d2ab3f73b4..eefa3ae76ff 100644
--- a/addons/google_map/i18n/sv.po
+++ b/addons/google_map/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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/tlh.po b/addons/google_map/i18n/tlh.po
index 7deae396b52..15ed9d4b9ed 100644
--- a/addons/google_map/i18n/tlh.po
+++ b/addons/google_map/i18n/tlh.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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/tr.po b/addons/google_map/i18n/tr.po
index bf79fabf338..5663bd77bb7 100644
--- a/addons/google_map/i18n/tr.po
+++ b/addons/google_map/i18n/tr.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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/uk.po b/addons/google_map/i18n/uk.po
index 27027bcf016..2045997242d 100644
--- a/addons/google_map/i18n/uk.po
+++ b/addons/google_map/i18n/uk.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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/vi.po b/addons/google_map/i18n/vi.po
index 3d1b72f7995..854b966274b 100644
--- a/addons/google_map/i18n/vi.po
+++ b/addons/google_map/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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/zh_CN.po b/addons/google_map/i18n/zh_CN.po
index ad6157591c6..3ba2b4c4885 100644
--- a/addons/google_map/i18n/zh_CN.po
+++ b/addons/google_map/i18n/zh_CN.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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/zh_TW.po b/addons/google_map/i18n/zh_TW.po
index 10e7f69c750..343935e151f 100644
--- a/addons/google_map/i18n/zh_TW.po
+++ b/addons/google_map/i18n/zh_TW.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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
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 113dc31b7c4..7c400ecf40e 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
 
@@ -172,7 +172,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}}
@@ -180,7 +180,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/ar.po b/addons/hr/i18n/ar.po
index e1908594197..658e37097cd 100644
--- a/addons/hr/i18n/ar.po
+++ b/addons/hr/i18n/ar.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -277,11 +272,6 @@ msgstr ""
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr ""
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -335,11 +325,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -429,6 +414,21 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -439,14 +439,19 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr ""
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: field:hr.employee,address_id:0
+msgid "Working Address"
 msgstr ""
 
 #. module: hr
@@ -459,6 +464,14 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -522,6 +535,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -567,12 +585,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -747,6 +759,14 @@ msgstr ""
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
diff --git a/addons/hr/i18n/bg.po b/addons/hr/i18n/bg.po
index 666e76926f7..6c3fe31558a 100644
--- a/addons/hr/i18n/bg.po
+++ b/addons/hr/i18n/bg.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 04:13+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@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-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -277,11 +272,6 @@ msgstr ""
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr ""
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -335,11 +325,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -429,6 +414,21 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -439,14 +439,19 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr ""
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: field:hr.employee,address_id:0
+msgid "Working Address"
 msgstr ""
 
 #. module: hr
@@ -459,6 +464,14 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -523,6 +536,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -568,14 +586,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-"символи!"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -750,7 +760,24 @@ msgstr ""
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Невалиден XML за преглед на архитектурата"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
+#~ "символи!"
diff --git a/addons/hr/i18n/bs.po b/addons/hr/i18n/bs.po
index 589f768c055..e6994f4b523 100644
--- a/addons/hr/i18n/bs.po
+++ b/addons/hr/i18n/bs.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-29 09: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-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Neispravan naziv modela u definiciji zadatka."
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -277,11 +272,6 @@ msgstr "Uposlenik"
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Adresa zaposlenja"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -335,11 +325,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neispravan XML za arhitekturu prikaza!"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -429,6 +414,21 @@ msgstr ""
 msgid "Category"
 msgstr "Kategorija"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -439,15 +439,20 @@ msgstr ""
 msgid "Note"
 msgstr "Bilješka"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Kontakt informacije"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Adresa zaposlenja"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -459,6 +464,14 @@ msgstr ""
 msgid "Status"
 msgstr "Status"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -522,6 +535,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -567,13 +585,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr "Lične informacije"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv Objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -748,11 +759,22 @@ msgstr "Rukovodilac"
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
 msgstr "Podređeni"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neispravan naziv modela u definiciji zadatka."
+
 #~ msgid "Working Time Categories"
 #~ msgstr "Kategorije radnog vremena"
 
@@ -786,6 +808,9 @@ msgstr "Podređeni"
 #~ msgid "Maried"
 #~ msgstr "Oženjen/udata"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neispravan XML za arhitekturu prikaza!"
+
 #~ msgid "Divorced"
 #~ msgstr "Razveden/a"
 
@@ -816,6 +841,11 @@ msgstr "Podređeni"
 #~ msgid "Starting date"
 #~ msgstr "Datum početka"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv Objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
+
 #~ msgid "Working Time"
 #~ msgstr "Radno vrijeme"
 
diff --git a/addons/hr/i18n/ca.po b/addons/hr/i18n/ca.po
index b11d850eb4d..12e69ad13d2 100644
--- a/addons/hr/i18n/ca.po
+++ b/addons/hr/i18n/ca.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-17 07:24+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-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de model no vàlid en la definició de l'acció."
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -277,11 +272,6 @@ msgstr "Empleat"
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Adreça de treball"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -335,11 +325,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -429,6 +414,21 @@ msgstr ""
 msgid "Category"
 msgstr "Categoria"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -439,15 +439,20 @@ msgstr ""
 msgid "Note"
 msgstr "Nota"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Informació de contacte"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Adreça de treball"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -459,6 +464,14 @@ msgstr ""
 msgid "Status"
 msgstr "Estat"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -522,6 +535,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -567,14 +585,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr "Informació personal"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-"especial!"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -749,6 +759,14 @@ msgstr "Director"
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
@@ -787,6 +805,9 @@ msgstr "Subordinats"
 #~ msgid "Fill up contact information"
 #~ msgstr "Omple informació de contacte"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invàlid per a la definició de la vista!"
+
 #~ msgid "Divorced"
 #~ msgstr "Divorciat/da"
 
@@ -832,6 +853,12 @@ msgstr "Subordinats"
 #~ msgid "Timesheet Line"
 #~ msgstr "Línia de full d'assistència"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+#~ "especial!"
+
 #~ msgid "Working Time"
 #~ msgstr "Horari treball"
 
@@ -867,3 +894,6 @@ msgstr "Subordinats"
 
 #~ msgid "Parents"
 #~ msgstr "Pares"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom de model no vàlid en la definició de l'acció."
diff --git a/addons/hr/i18n/cs.po b/addons/hr/i18n/cs.po
index 6d38355cdef..ce0e9d2eb35 100644
--- a/addons/hr/i18n/cs.po
+++ b/addons/hr/i18n/cs.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 12:00+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-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -277,11 +272,6 @@ msgstr ""
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr ""
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -335,11 +325,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -429,6 +414,21 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -439,14 +439,19 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr ""
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: field:hr.employee,address_id:0
+msgid "Working Address"
 msgstr ""
 
 #. module: hr
@@ -459,6 +464,14 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -522,6 +535,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -567,12 +585,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -747,6 +759,14 @@ msgstr ""
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
diff --git a/addons/hr/i18n/de.po b/addons/hr/i18n/de.po
index 0e3be94e8db..883124d7239 100644
--- a/addons/hr/i18n/de.po
+++ b/addons/hr/i18n/de.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-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/el.po b/addons/hr/i18n/el.po
index 2ac5e0ad795..23135fe066d 100644
--- a/addons/hr/i18n/el.po
+++ b/addons/hr/i18n/el.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 04:54+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -66,11 +66,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -280,11 +275,6 @@ msgstr "Υπάλληλος"
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Διεύθυνση Εργασίας"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -338,11 +328,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -432,6 +417,21 @@ msgstr ""
 msgid "Category"
 msgstr "Κατηγορία"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -442,15 +442,20 @@ msgstr ""
 msgid "Note"
 msgstr "Σημείωση"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Πληροφορίες Επαφής"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Διεύθυνση Εργασίας"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -462,6 +467,14 @@ msgstr ""
 msgid "Status"
 msgstr "Κατάσταση"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -525,6 +538,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -570,13 +588,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr "Προσωπικές Πληροφορίες"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -751,6 +762,14 @@ msgstr "Manager"
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
@@ -828,6 +847,11 @@ msgstr "Υφιστάμενοι"
 #~ msgid "Starting date"
 #~ msgstr "Ημερ/νία Εκκίνησης"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες"
+
 #~ msgid "Working Time"
 #~ msgstr "Ώρες Εργασίας"
 
@@ -864,6 +888,12 @@ msgstr "Υφιστάμενοι"
 #~ msgid "Timesheet Line"
 #~ msgstr "Γραμμή Φύλλου Χρόνου Εργασίας"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
+
 #~ msgid "Parent Users"
 #~ msgstr "Μητρικοί χρήστες"
 
diff --git a/addons/hr/i18n/es.po b/addons/hr/i18n/es.po
index c36afc154ca..01c62a753af 100644
--- a/addons/hr/i18n/es.po
+++ b/addons/hr/i18n/es.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-12-05 07:41+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\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-09 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/es_AR.po b/addons/hr/i18n/es_AR.po
index 22d3f790c44..3d1b9874ba4 100644
--- a/addons/hr/i18n/es_AR.po
+++ b/addons/hr/i18n/es_AR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-15 20:12+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.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-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -277,11 +272,6 @@ msgstr "Empleado"
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Dirección de trabajo"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -335,11 +325,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista!"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -429,6 +414,21 @@ msgstr ""
 msgid "Category"
 msgstr "Categoría"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -439,15 +439,20 @@ msgstr ""
 msgid "Note"
 msgstr "Nota"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Información de contacto"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Dirección de trabajo"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -459,6 +464,14 @@ msgstr ""
 msgid "Status"
 msgstr "Estado"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -522,6 +535,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -567,14 +585,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr "Información personal"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
-"especial!"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -749,6 +759,14 @@ msgstr "Manager"
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
@@ -867,3 +885,12 @@ msgstr "Subordinados"
 
 #~ msgid "Timesheet Line"
 #~ msgstr "Linea de hoja de tareas"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
+#~ "especial!"
diff --git a/addons/hr/i18n/es_EC.po b/addons/hr/i18n/es_EC.po
index 588b83c38e7..cb4236b1364 100644
--- a/addons/hr/i18n/es_EC.po
+++ b/addons/hr/i18n/es_EC.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-03-09 04:16+0000\n"
-"Last-Translator: Cristian Salamea (GnuThink) <ovnicraft@gmail.com>\n"
+"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -64,11 +64,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo inválido en la definición de acción."
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -278,11 +273,6 @@ msgstr "Empleado"
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Dirección de trabajo"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -336,11 +326,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -430,6 +415,21 @@ msgstr ""
 msgid "Category"
 msgstr "Categoría"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -440,15 +440,20 @@ msgstr ""
 msgid "Note"
 msgstr "Nota"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Información de contacto"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Dirección de trabajo"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -460,6 +465,14 @@ msgstr ""
 msgid "Status"
 msgstr "Estado"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -523,6 +536,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -568,14 +586,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr "Información personal"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -750,6 +760,14 @@ msgstr "Director"
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
diff --git a/addons/hr/i18n/et.po b/addons/hr/i18n/et.po
index 1b7899342a5..d5cdf8a6cab 100644
--- a/addons/hr/i18n/et.po
+++ b/addons/hr/i18n/et.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 04:55+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-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -277,11 +272,6 @@ msgstr "Töötaja"
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Tööaadress"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -335,11 +325,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -429,6 +414,21 @@ msgstr ""
 msgid "Category"
 msgstr "Kategooria"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -439,15 +439,20 @@ msgstr ""
 msgid "Note"
 msgstr "Märkus"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "KontaktInformatsioon"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Tööaadress"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -459,6 +464,14 @@ msgstr ""
 msgid "Status"
 msgstr "Staatus"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -522,6 +535,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -567,13 +585,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr "Isiklikud andmed"
 
-#. module: hr
-#: 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: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -748,6 +759,14 @@ msgstr "Juht"
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
@@ -783,6 +802,9 @@ msgstr "Alluvad"
 #~ msgid "Fill up contact information"
 #~ msgstr "Täida kontaktinformatsioon"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Vigane XML vaate arhitektuurile!"
+
 #~ msgid "Divorced"
 #~ msgstr "Lahutatud"
 
@@ -822,6 +844,11 @@ msgstr "Alluvad"
 #~ msgid "Starting date"
 #~ msgstr "Alustamise kuupä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 "Working Time"
 #~ msgstr "Tööaeg"
 
@@ -849,6 +876,9 @@ msgstr "Alluvad"
 #~ msgid "New Employee"
 #~ msgstr "Uus töötaja"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
+
 #~ msgid "Employee's timesheet group"
 #~ msgstr "Töötaja tööajalehe grupp"
 
diff --git a/addons/hr/i18n/fi.po b/addons/hr/i18n/fi.po
index 147e336463e..f0d9482459e 100644
--- a/addons/hr/i18n/fi.po
+++ b/addons/hr/i18n/fi.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 04:55+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: Finnish <fi@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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -64,11 +64,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -278,11 +273,6 @@ msgstr "Työntekijä"
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Työosoite"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -336,11 +326,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -430,6 +415,21 @@ msgstr ""
 msgid "Category"
 msgstr "Kategoria"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -440,15 +440,20 @@ msgstr ""
 msgid "Note"
 msgstr "Huomautus"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Yhteystiedot"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Työosoite"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -460,6 +465,14 @@ msgstr ""
 msgid "Status"
 msgstr "Asema"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -523,6 +536,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -568,12 +586,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr "Henkilötiedot"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -748,6 +760,14 @@ msgstr "Esimies"
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
@@ -816,6 +836,9 @@ msgstr "Alaiset"
 #~ msgid "Tuesday"
 #~ msgstr "Tiistai"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
+
 #~ msgid "Wednesday"
 #~ msgstr "Keskiviikko"
 
@@ -834,12 +857,19 @@ msgstr "Alaiset"
 #~ msgid "Other"
 #~ msgstr "Muu"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
+
 #~ msgid "Saturday"
 #~ msgstr "Lauantai"
 
 #~ msgid "Parents"
 #~ msgstr "Vanhemmat"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
+
 #~ msgid "Working Time Categories"
 #~ msgstr "Työaika kategoriat"
 
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
index 39fafb56c06..688ab812dc2 100644
--- a/addons/hr/i18n/fr.po
+++ b/addons/hr/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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-30 16:45+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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr "Grouper par..."
 msgid "Work E-mail"
 msgstr "E-mail professionnel"
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -260,11 +255,6 @@ msgstr "Catégories filles"
 msgid "Job Description"
 msgstr ""
 
-#. module: hr
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
@@ -288,21 +278,11 @@ msgstr "Employé"
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Adresse professionnelle"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
 msgstr "Configuration de l'application des ressources humaines"
 
-#. module: hr
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
@@ -351,11 +331,6 @@ msgstr "Catégories"
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -431,11 +406,6 @@ msgstr ""
 msgid "hr.department"
 msgstr "hr.department"
 
-#. module: hr
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: hr
 #: help:hr.employee,parent_id:0
 msgid "It is linked with manager of Department"
@@ -477,15 +447,20 @@ msgstr "Compte bancaire du salaire de l'employé"
 msgid "Note"
 msgstr "Note"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Informations sur le contact"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Adresse professionnelle"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -569,6 +544,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -614,14 +594,6 @@ msgstr "Comptabilité de la paie"
 msgid "Personal Information"
 msgstr "Information personnelle"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
-"spéciaux !"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -844,6 +816,9 @@ msgstr "Subordonnés"
 #~ msgid "Fill up contact information"
 #~ msgstr "Remplir les informations de contact"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valide pour l'architecture de la vue"
+
 #~ msgid "Divorced"
 #~ msgstr "Divorcé(e)"
 
@@ -889,6 +864,12 @@ msgstr "Subordonnés"
 #~ msgid "Timesheet Line"
 #~ msgstr "Ligne de feuille de temps"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+#~ "spéciaux !"
+
 #~ msgid "Working Time"
 #~ msgstr "Temps de Travail"
 
diff --git a/addons/hr/i18n/hi.po b/addons/hr/i18n/hi.po
index dec45b3717a..cbd9e5841ba 100644
--- a/addons/hr/i18n/hi.po
+++ b/addons/hr/i18n/hi.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 04:56+0000\n"
 "Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
 "Language-Team: Hindi <hi@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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -64,11 +64,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -278,11 +273,6 @@ msgstr ""
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr ""
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -336,11 +326,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -430,6 +415,21 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -440,14 +440,19 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr ""
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: field:hr.employee,address_id:0
+msgid "Working Address"
 msgstr ""
 
 #. module: hr
@@ -460,6 +465,14 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -523,6 +536,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -568,12 +586,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -748,6 +760,14 @@ msgstr ""
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
index 4864d8ff9fd..e8ca840a90e 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/i18n/hr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 09: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-10-31 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
@@ -64,11 +64,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nepravilno ime modela u definiciji radnje."
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -278,11 +273,6 @@ msgstr "Djelatnik"
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Poslovna adresa"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -336,11 +326,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neispravan XML za Arhitekturu Prikaza!"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -430,6 +415,21 @@ msgstr ""
 msgid "Category"
 msgstr "Kategorija"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -440,15 +440,20 @@ msgstr ""
 msgid "Note"
 msgstr "Bilješka"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Kontakt podaci"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Poslovna adresa"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -460,6 +465,14 @@ msgstr ""
 msgid "Status"
 msgstr "Status"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -523,6 +536,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -568,13 +586,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr "Osobni podaci"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -749,11 +760,30 @@ msgstr "Voditelj"
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
 msgstr "Podređeni Djelatnici"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neispravan XML za Arhitekturu Prikaza!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nepravilno ime modela u definiciji radnje."
+
 #~ msgid "Working Time Categories"
 #~ msgstr "Kategorije radnog vremena"
 
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/hu.po b/addons/hr/i18n/hu.po
index fcd821dfad0..fa8d6fc0def 100644
--- a/addons/hr/i18n/hu.po
+++ b/addons/hr/i18n/hu.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-08 14:32+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-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -277,11 +272,6 @@ msgstr ""
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr ""
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -335,11 +325,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -429,6 +414,21 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -439,14 +439,19 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr ""
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: field:hr.employee,address_id:0
+msgid "Working Address"
 msgstr ""
 
 #. module: hr
@@ -459,6 +464,14 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -522,6 +535,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -567,12 +585,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -747,6 +759,14 @@ msgstr ""
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
diff --git a/addons/hr/i18n/id.po b/addons/hr/i18n/id.po
index b035c17a6aa..64231f72367 100644
--- a/addons/hr/i18n/id.po
+++ b/addons/hr/i18n/id.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-09 17:36+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-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -277,11 +272,6 @@ msgstr ""
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr ""
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -335,11 +325,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -429,6 +414,21 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -439,14 +439,19 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr ""
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: field:hr.employee,address_id:0
+msgid "Working Address"
 msgstr ""
 
 #. module: hr
@@ -459,6 +464,14 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -522,6 +535,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -567,12 +585,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -747,6 +759,14 @@ msgstr ""
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
diff --git a/addons/hr/i18n/it.po b/addons/hr/i18n/it.po
index a53627d9752..32893c9bf75 100644
--- a/addons/hr/i18n/it.po
+++ b/addons/hr/i18n/it.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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-29 07: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-11-30 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr "Raggruppato per..."
 msgid "Work E-mail"
 msgstr "E-mail ufficio"
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome del modello non valido nella definizione dell'azione"
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -262,11 +257,6 @@ msgstr "Categorie Secondarie"
 msgid "Job Description"
 msgstr "Descrizione lavoro"
 
-#. module: hr
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere unico!"
-
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
@@ -290,21 +280,11 @@ msgstr "Dipendente"
 msgid "Other information"
 msgstr "Altre informazioni"
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Indirizzo di lavoro"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
 msgstr "Configurazione applicazione Risorse Umane"
 
-#. module: hr
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "L'ID certificato del modulo deve essere unico!"
-
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
@@ -353,11 +333,6 @@ msgstr "Categorie"
 msgid "Expected Employees"
 msgstr "Dipendenti previsti"
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -433,11 +408,6 @@ msgstr ""
 msgid "hr.department"
 msgstr "hr.department"
 
-#. module: hr
-#: 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!"
-
 #. module: hr
 #: help:hr.employee,parent_id:0
 msgid "It is linked with manager of Department"
@@ -490,15 +460,20 @@ msgstr "Conto bancario per lo stipendio del dipendente"
 msgid "Note"
 msgstr "Nota"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Informazioni Contatto"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Errore! Non è possible creare menù ricorsivi"
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Indirizzo di lavoro"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -587,6 +562,11 @@ msgstr "Completato"
 msgid "Status Description"
 msgstr "Descrizione Stato"
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -632,14 +612,6 @@ msgstr "Contabilità paghe"
 msgid "Personal Information"
 msgstr "Informazioni Personali"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -867,6 +839,9 @@ msgstr "Subordinati"
 #~ msgid "Fill up contact information"
 #~ msgstr "Compilare le informazioni di contatto"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per Visualizzazione Architettura!"
+
 #~ msgid "Divorced"
 #~ msgstr "Divorziato/a"
 
@@ -912,6 +887,12 @@ msgstr "Subordinati"
 #~ msgid "Timesheet Line"
 #~ msgstr "Riga Orari di Lavoro"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
+
 #~ msgid "Working Time"
 #~ msgstr "Orario di Lavoro"
 
@@ -947,3 +928,18 @@ msgstr "Subordinati"
 
 #~ msgid "Parent Users"
 #~ msgstr "Utenti Padri"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Errore! Non è possible creare menù ricorsivi"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "L'ID certificato del modulo deve essere unico!"
+
+#~ 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!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome del modello non valido nella definizione dell'azione"
diff --git a/addons/hr/i18n/ko.po b/addons/hr/i18n/ko.po
index a26318928e4..220498c9ec5 100644
--- a/addons/hr/i18n/ko.po
+++ b/addons/hr/i18n/ko.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 04:56+0000\n"
 "Last-Translator: Bundo <bundo@bundo.biz>\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-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -64,11 +64,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "액션 정의에 잘못된 모델 이름이 있습니다."
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -278,11 +273,6 @@ msgstr "직원"
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "사무실 주소"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -336,11 +326,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "유효하지 않은 뷰 아키텍처의 XML"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -430,6 +415,21 @@ msgstr ""
 msgid "Category"
 msgstr "카테고리"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -440,15 +440,20 @@ msgstr ""
 msgid "Note"
 msgstr "노트"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "연락처"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "사무실 주소"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -460,6 +465,14 @@ msgstr ""
 msgid "Status"
 msgstr "상태"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -523,6 +536,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -568,12 +586,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr "개인 정보"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수문자를 포함하면 안됩니다!"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -748,6 +760,14 @@ msgstr "매니저"
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
@@ -795,6 +815,9 @@ msgstr "종속"
 #~ msgid "Maried"
 #~ msgstr "기혼"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "유효하지 않은 뷰 아키텍처의 XML"
+
 #~ msgid "Divorced"
 #~ msgstr "이혼"
 
@@ -840,6 +863,10 @@ msgstr "종속"
 #~ msgid "Starting date"
 #~ msgstr "시작 날짜"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수문자를 포함하면 안됩니다!"
+
 #~ msgid "Thursday"
 #~ msgstr "목요일"
 
@@ -866,3 +893,6 @@ msgstr "종속"
 
 #~ msgid "Fill up employee's contact information"
 #~ msgstr "직원 연락처를 작성하십시오"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "액션 정의에 잘못된 모델 이름이 있습니다."
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
index 611bd57b51f..54b41c2263b 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/i18n/lt.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-09 07:19+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-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -277,11 +272,6 @@ msgstr "Darbuotojas"
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Darbovietės adresas"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -335,11 +325,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Netinkamas XML peržiūros architektūrai!"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -429,6 +414,21 @@ msgstr ""
 msgid "Category"
 msgstr "Kategorija"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -439,15 +439,20 @@ msgstr ""
 msgid "Note"
 msgstr "Pastaba"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Kontaktinė informacija"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Darbovietės adresas"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -459,6 +464,14 @@ msgstr ""
 msgid "Status"
 msgstr "Būsena"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -522,6 +535,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -567,14 +585,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr "Asmeninė informacija"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objekto pavadinimas turi prasidėti su x_ ir jame negali būti specialiųjų "
-"ženklų!"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -749,6 +759,14 @@ msgstr "Vadovas"
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
@@ -859,5 +877,14 @@ msgstr "Pavaldiniai"
 #~ msgid "Parent Users"
 #~ msgstr "Aukštesnieji naudotojai"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Netinkamas XML peržiūros architektūrai!"
+
 #~ msgid "Create openerp user"
 #~ msgstr "Sukurti OpenERP naudotoją"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objekto pavadinimas turi prasidėti su x_ ir jame negali būti specialiųjų "
+#~ "ženklų!"
diff --git a/addons/hr/i18n/lv.po b/addons/hr/i18n/lv.po
index bf03ffe2776..6a60d53274f 100644
--- a/addons/hr/i18n/lv.po
+++ b/addons/hr/i18n/lv.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-10-08 08:10+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Latvian <lv@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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -64,11 +64,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -278,11 +273,6 @@ msgstr "Darbinieks"
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Darbavietas Adrese"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -336,11 +326,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nepareizs Skatījuma uzbūves XML!"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -430,6 +415,21 @@ msgstr ""
 msgid "Category"
 msgstr "Kategorija"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -440,15 +440,20 @@ msgstr ""
 msgid "Note"
 msgstr "Piezīmes"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Kontakta Informācija"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Darbavietas Adrese"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -460,6 +465,14 @@ msgstr ""
 msgid "Status"
 msgstr "Stāvoklis"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -523,6 +536,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -568,13 +586,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr "Personīgā Informācija"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objekta nosaukumam jāsākas ar x_ un tas nedrīkst saturēt speciālos simbolus!"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -749,6 +760,14 @@ msgstr "Vadītājs"
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
@@ -796,6 +815,9 @@ msgstr "Pakļautie"
 #~ msgid "Maried"
 #~ msgstr "Precējies"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nepareizs Skatījuma uzbūves XML!"
+
 #~ msgid "Divorced"
 #~ msgstr "Šķīries"
 
@@ -838,6 +860,11 @@ msgstr "Pakļautie"
 #~ msgid "Starting date"
 #~ msgstr "Sākuma datums"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objekta nosaukumam jāsākas ar x_ un tas nedrīkst saturēt speciālos simbolus!"
+
 #~ msgid "Timesheet Line"
 #~ msgstr "Darba laika uzskaites Tabeles Ieraksts"
 
diff --git a/addons/hr/i18n/mn.po b/addons/hr/i18n/mn.po
index 25aa277a063..7fe22e5a4dc 100644
--- a/addons/hr/i18n/mn.po
+++ b/addons/hr/i18n/mn.po
@@ -13,14 +13,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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-25 19:26+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-26 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -70,11 +70,6 @@ msgstr "Бүлэглэх..."
 msgid "Work E-mail"
 msgstr "Ажлын Э-мэйл"
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Моделийн нэр алдаатай тодорхойлсон байна."
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -266,11 +261,6 @@ msgstr "Хүү зэрэглэл"
 msgid "Job Description"
 msgstr "Ажлын байрны тодорхойлолт"
 
-#. module: hr
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
@@ -294,21 +284,11 @@ msgstr "Ажилтан"
 msgid "Other information"
 msgstr "Бусад мэдээлэл"
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Ажлын хаяг"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
 msgstr "Хүний нөөцийн модулийн тохиргоо"
 
-#. module: hr
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
@@ -357,11 +337,6 @@ msgstr "Зэрэглэл"
 msgid "Expected Employees"
 msgstr "Нийт орон тоо"
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Харагдацын архитектурын xml алдаатай !"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -437,11 +412,6 @@ msgstr ""
 msgid "hr.department"
 msgstr "Хэлтэс"
 
-#. module: hr
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: hr
 #: help:hr.employee,parent_id:0
 msgid "It is linked with manager of Department"
@@ -483,15 +453,20 @@ msgstr "банк дах ажилтны цалингийн данс"
 msgid "Note"
 msgstr "Тэмдэглэл"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Гэрээний мэдээлэл"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Алдаа! Рекурс цэс үүсгэж болохгүй"
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Ажлын хаяг"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -574,6 +549,11 @@ msgstr "Хуучин"
 msgid "Status Description"
 msgstr "Гэрлэлтийн байдлын тайлбар"
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -619,14 +599,6 @@ msgstr "Цалингийн санхүү бүртгэл"
 msgid "Personal Information"
 msgstr "Хувийн мэдээлэл"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-"болохгүй!"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -844,6 +816,12 @@ msgstr "Харьяалагдсан"
 #~ msgid "Starting date"
 #~ msgstr "Эхлэл огноо"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+#~ "болохгүй!"
+
 #~ msgid "Thursday"
 #~ msgstr "Пүрэв"
 
@@ -906,3 +884,12 @@ msgstr "Харьяалагдсан"
 
 #~ msgid "All Employees"
 #~ msgstr "Бүх ажилчид"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Моделийн нэр алдаатай тодорхойлсон байна."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Харагдацын архитектурын xml алдаатай !"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Алдаа! Рекурс цэс үүсгэж болохгүй"
diff --git a/addons/hr/i18n/nl.po b/addons/hr/i18n/nl.po
index f058d47114d..5f48dd18413 100644
--- a/addons/hr/i18n/nl.po
+++ b/addons/hr/i18n/nl.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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-12-02 07: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-03 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr "Groepeer op..."
 msgid "Work E-mail"
 msgstr "Werk email"
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de actie-definitie."
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -260,11 +255,6 @@ msgstr "Subcategorieën"
 msgid "Job Description"
 msgstr "Functieomschrijving"
 
-#. module: hr
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "De modulenaam moet uniek zijn !"
-
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
@@ -288,21 +278,11 @@ msgstr "Medewerker"
 msgid "Other information"
 msgstr "Overige informatie"
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Werkadres"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
 msgstr "Personeel applicatie configuratie"
 
-#. module: hr
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
@@ -351,11 +331,6 @@ msgstr "Categorieën"
 msgid "Expected Employees"
 msgstr "Verwachte medewerkers"
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -431,11 +406,6 @@ msgstr ""
 msgid "hr.department"
 msgstr "hr.department"
 
-#. module: hr
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
 #. module: hr
 #: help:hr.employee,parent_id:0
 msgid "It is linked with manager of Department"
@@ -488,15 +458,20 @@ msgstr "Medewerker salaris bankrekening"
 msgid "Note"
 msgstr "Opmerking"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Contactgegevens"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fout ! U kunt geen recursief menu maken."
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Werkadres"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -584,6 +559,11 @@ msgstr "Oud"
 msgid "Status Description"
 msgstr "Status omschrijving"
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -629,13 +609,6 @@ msgstr "Loonadministratie"
 msgid "Personal Information"
 msgstr "Persoonlijke gegevens"
 
-#. module: hr
-#: 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: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -907,12 +880,18 @@ msgstr "Ondergeschikten"
 #~ msgid "Working Time Categories"
 #~ msgstr "Werktijdcategorieën"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ongeldige modelnaam in de actie-definitie."
+
 #~ msgid "Unmaried"
 #~ msgstr "Ongehuwd"
 
 #~ msgid "Maried"
 #~ msgstr "Gehuwd"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML voor weergave!"
+
 #~ msgid "Day of week"
 #~ msgstr "Dag van de week"
 
@@ -942,3 +921,20 @@ msgstr "Ondergeschikten"
 
 #~ msgid "Birthday"
 #~ msgstr "Geboortedatum"
+
+#~ 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 "Error ! You can not create recursive Menu."
+#~ msgstr "Fout ! U kunt geen recursief menu maken."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/hr/i18n/nl_BE.po b/addons/hr/i18n/nl_BE.po
index 9d053629878..d9ebcadabac 100644
--- a/addons/hr/i18n/nl_BE.po
+++ b/addons/hr/i18n/nl_BE.po
@@ -4,43 +4,43 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-11-02 07:16+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2009-04-10 10:19+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-11-03 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
 msgid "Openerp user"
-msgstr "OpenERP gebruiker"
+msgstr ""
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,requirements:0
 msgid "Requirements"
-msgstr "Functie-eisen"
+msgstr ""
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
-msgstr "Fout! U kunt geen recursieve afdelingen aanmaken."
+msgstr ""
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr "Koppel de medewerker met informatie"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr "BSN-nr"
+msgstr ""
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
@@ -49,24 +49,19 @@ msgstr "BSN-nr"
 #: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr "Personeel"
+msgstr ""
 
 #. module: hr
 #: view:hr.department:0
 #: view:hr.employee:0
 #: view:hr.job:0
 msgid "Group By..."
-msgstr "Groepeer op..."
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
 msgid "Work E-mail"
-msgstr "Werk email"
-
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de actie-definitie."
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
@@ -75,32 +70,32 @@ msgstr "Ongeldige modelnaam in de actie-definitie."
 #: field:hr.job,department_id:0
 #: view:res.users:0
 msgid "Department"
-msgstr "Afdeling"
+msgstr ""
 
 #. module: hr
 #: help:hr.installer,hr_attendance:0
 msgid "Simplifies the management of employee's attendances."
-msgstr "Vereenvoudigt het beheer van medewerkers aanwezigheid."
+msgstr ""
 
 #. module: hr
 #: view:hr.job:0
 msgid "Mark as Old"
-msgstr "Markeer als oud"
+msgstr ""
 
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
-msgstr "Functies"
+msgstr ""
 
 #. module: hr
 #: view:hr.job:0
 msgid "In Recruitment"
-msgstr "Wordt geworven"
+msgstr ""
 
 #. module: hr
 #: view:hr.installer:0
 msgid "title"
-msgstr "titel"
+msgstr ""
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -108,27 +103,27 @@ msgstr "titel"
 #: view:hr.job:0
 #: field:hr.job,company_id:0
 msgid "Company"
-msgstr "Bedrijf"
+msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Expected in Recruitment"
-msgstr "Werving verwacht"
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Holidays"
-msgstr "Vakantie"
+msgstr ""
 
 #. module: hr
 #: help:hr.installer,hr_holidays:0
 msgid "Tracks employee leaves, allocation requests and planning."
-msgstr "Houdt medewerker verlof, vakanties en planning bij."
+msgstr ""
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_employee_marital_status
 msgid "Employee Marital Status"
-msgstr "Medewerker huwelijkse staat"
+msgstr ""
 
 #. module: hr
 #: help:hr.employee,partner_id:0
@@ -136,50 +131,47 @@ msgid ""
 "Partner that is related to the current employee. Accounting transaction will "
 "be written on this partner belongs to employee."
 msgstr ""
-"Relatie die is verbonden met de actuele medewerker. Boekingen worden gemaakt "
-"op de relatie die verbonden is met de medewerker."
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Link a user to an employee"
-msgstr "Koppel een gebruiker aan een medewerker"
+msgstr ""
 
 #. module: hr
 #: field:hr.installer,hr_contract:0
 msgid "Employee's Contracts"
-msgstr "Arbeidsovereenkomsten"
+msgstr ""
 
 #. module: hr
 #: help:hr.installer,hr_payroll:0
 msgid "Generic Payroll system."
-msgstr "Algemeen loonlijst systeem."
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
 msgid "My Departments Employee"
-msgstr "Mijn afdeling medewerkers"
+msgstr ""
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
-"Fout ! U kunt geen afdeling selecteren waarvan de medewerker de beheerder is."
 
 #. module: hr
 #: help:hr.employee,passport_id:0
 msgid "Employee Passport Information"
-msgstr "Medewerker paspoort informatie"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Position"
-msgstr "Baan"
+msgstr ""
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr "Medewerkershierarchie"
+msgstr ""
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
@@ -187,88 +179,85 @@ msgid ""
 "The Related user field on the Employee form allows to link the OpenERP user "
 "(and her rights) to the employee."
 msgstr ""
-"Het verbonden gebruiker veld op het medewerker formulier laat de OpenERP "
-"gebruiker (en haar rechten) koppelen met de medewerker."
 
 #. module: hr
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Recruitement"
-msgstr "Wordt geworven"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,identification_id:0
 msgid "Identification No"
-msgstr "Identificatienr."
+msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "No of Employee"
-msgstr "Aantal medewerkers"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Female"
-msgstr "Vrouw"
+msgstr ""
 
 #. module: hr
 #: help:hr.installer,hr_timesheet_sheet:0
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
 msgstr ""
-"Helpt medewerkers hun urenstaten en aanwezigheid invullen en controleren."
 
 #. module: hr
 #: field:hr.installer,hr_evaluation:0
 msgid "Periodic Evaluations"
-msgstr "Periodieke evaluaties"
+msgstr ""
 
 #. module: hr
 #: field:hr.installer,hr_timesheet_sheet:0
 msgid "Timesheets"
-msgstr "Urenstaten"
+msgstr ""
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
 msgid "Employees Structure"
-msgstr "Organigram"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Social IDs"
-msgstr "BSN (SoFi) nummer"
+msgstr ""
 
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employee with that job."
-msgstr "Aantal medewerkers met deze functie."
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_phone:0
 msgid "Work Phone"
-msgstr "Telefoon werk"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr "Subcategorieën"
+msgstr ""
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,description:0
 #: model:ir.model,name:hr.model_hr_job
 msgid "Job Description"
-msgstr "Functieomschrijving"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
-msgstr "Locatie kantoor"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,passport_id:0
 msgid "Passport"
-msgstr "Paspoort"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
@@ -276,90 +265,80 @@ msgstr "Paspoort"
 #: model:ir.model,name:hr.model_hr_employee
 #: model:process.node,name:hr.process_node_employee0
 msgid "Employee"
-msgstr "Medewerker"
+msgstr ""
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr "Overige informatie"
-
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Werkadres"
+msgstr ""
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
-msgstr "Personeel applicatie configuratie"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
-msgstr "Geboortedatum"
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
 msgid "Reporting"
-msgstr "Overzichten"
+msgstr ""
 
 #. module: hr
 #: model:ir.model,name:hr.model_ir_actions_act_window
 msgid "ir.actions.act_window"
-msgstr "ir.actions.act_window"
+msgstr ""
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr
 msgid "Human Resources Dashboard"
-msgstr "Personeel dashboard"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,job_id:0
 #: view:hr.job:0
 msgid "Job"
-msgstr "Functie"
+msgstr ""
 
 #. module: hr
 #: view:hr.department:0
 #: field:hr.department,member_ids:0
 msgid "Members"
-msgstr "Leden"
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
 msgid "Configuration"
-msgstr "Instellingen"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Categories"
-msgstr "Categorieën"
+msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Expected Employees"
-msgstr "Verwachte medewerkers"
-
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
+msgstr ""
 
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
-msgstr "SOFI nummer"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr "Bovenliggende categorie"
+msgstr ""
 
 #. module: hr
 #: constraint:hr.employee.category:0
 msgid "Error ! You cannot create recursive Categories."
-msgstr "Fout ! U kunt geen recursieve categorieën maken."
+msgstr ""
 
 #. module: hr
 #: view:hr.department:0
@@ -368,44 +347,44 @@ msgstr "Fout ! U kunt geen recursieve categorieën maken."
 #: view:res.users:0
 #: field:res.users,context_department_id:0
 msgid "Departments"
-msgstr "Afdelingen"
+msgstr ""
 
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr "Contactpersoon medewerker"
+msgstr ""
 
 #. module: hr
 #: view:board.board:0
 msgid "My Board"
-msgstr "Mijn board"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Male"
-msgstr "Man"
+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
 msgid "Categories of Employee"
-msgstr "Categorieën medewerkers"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr "Categorie medewerker"
+msgstr ""
 
 #. module: hr
 #: field:hr.installer,config_logo:0
 msgid "Image"
-msgstr "Afbeelding"
+msgstr ""
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract"
-msgstr "Arbeidsovereenkomst"
+msgstr ""
 
 #. module: hr
 #: help:hr.installer,hr_evaluation:0
@@ -413,100 +392,126 @@ msgid ""
 "Lets you create and manage the periodic evaluation and performance review of "
 "employees."
 msgstr ""
-"Laat u de periodieke evaluaties en functioneringsgesprekken van medewerkers "
-"maken en beheren"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
 msgid "hr.department"
-msgstr "hr.department"
+msgstr ""
 
 #. module: hr
 #: help:hr.employee,parent_id:0
 msgid "It is linked with manager of Department"
-msgstr "Het is gekoppeld met de manager van de afdeling"
+msgstr ""
 
 #. module: hr
 #: field:hr.installer,hr_recruitment:0
 msgid "Recruitment Process"
-msgstr "Wervingsproces"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,category_ids:0
 #: field:hr.employee.category,name:0
 msgid "Category"
-msgstr "Categorie"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr "Medewerker salaris bankrekening"
+msgstr ""
 
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
-msgstr "Opmerking"
+msgstr ""
+
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
-msgstr "Contactgegevens"
+msgstr ""
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fout ! U kunt geen recursief menu maken."
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr ""
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
 msgid "HR Manager Dashboard"
-msgstr "HR manager dashboard"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Status"
-msgstr "Status"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
 
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
-msgstr "Configuratievoortgang"
+msgstr ""
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_tree
 msgid "Categories structure"
-msgstr "Categoriestructuur"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,partner_id:0
 msgid "unknown"
-msgstr "onbekend"
+msgstr ""
 
 #. module: hr
 #: field:hr.installer,hr_holidays:0
 msgid "Holidays / Leaves Management"
-msgstr "Vakantie / verlofbeheer"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,ssnid:0
 msgid "SSN No"
-msgstr "BSN nummer"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Active"
-msgstr "Actief"
+msgstr ""
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "Fout ! U kunt geen recursieve hiërarchie van medewerkers maken."
+msgstr ""
 
 #. module: hr
 #: view:hr.department:0
 msgid "Companies"
-msgstr "Bedrijven"
+msgstr ""
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -514,29 +519,32 @@ msgid ""
 "In the Employee form, there are different kind of information like Contact "
 "information."
 msgstr ""
-"In het medewerker formulier staan verschillende soorten informatie zoals "
-"contactgegevens."
 
 #. module: hr
 #: help:hr.job,expected_employees:0
 msgid "Required number of Employees in total for that job."
-msgstr "Totaal aantal vereiste medewerkers voor deze functie."
+msgstr ""
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Old"
-msgstr "Oud"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee.marital.status,description:0
 msgid "Status Description"
-msgstr "Status omschrijving"
+msgstr ""
+
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
 msgid "State"
-msgstr "Status"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,marital:0
@@ -545,49 +553,42 @@ msgstr "Status"
 #: model:ir.actions.act_window,name:hr.action_hr_marital_status
 #: model:ir.ui.menu,name:hr.hr_menu_marital_status
 msgid "Marital Status"
-msgstr "Burgerlijke staat"
+msgstr ""
 
 #. module: hr
 #: help:hr.installer,hr_recruitment:0
 msgid "Helps you manage and streamline your recruitment process."
-msgstr "Helpt u bij het beheren en stroomlijnen van uw wervingsproces."
+msgstr ""
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee form and structure"
-msgstr "Medewerker formulier en structuur"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,photo:0
 msgid "Photo"
-msgstr "Foto"
+msgstr ""
 
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
 msgid "res.users"
-msgstr "res.users"
+msgstr ""
 
 #. module: hr
 #: field:hr.installer,hr_payroll_account:0
 msgid "Payroll Accounting"
-msgstr "Loonadministratie"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Personal Information"
-msgstr "Persoonlijke gegevens"
-
-#. module: hr
-#: 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 karakters bevatten !"
 
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
-msgstr "Actuele activiteit"
+msgstr ""
 
 #. module: hr
 #: help:hr.installer,hr_expense:0
@@ -595,105 +596,102 @@ msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
 msgstr ""
-"Beheert medewerker declaraties en kan automatisch doorberekenen aan klanten "
-"als de uitgave project-gerelateerd is."
 
 #. module: hr
 #: view:hr.job:0
 msgid "Current"
-msgstr "Actueel"
+msgstr ""
 
 #. module: hr
 #: field:hr.department,parent_id:0
 msgid "Parent Department"
-msgstr "Hoofdafdeling"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee.category:0
 msgid "Employees Categories"
-msgstr "Categorieën medewerkers"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
-msgstr "Privé-adres"
+msgstr ""
 
 #. module: hr
 #: field:hr.installer,hr_attendance:0
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendances"
-msgstr "Aanwezigheid"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee.marital.status:0
 #: view:hr.job:0
 msgid "Description"
-msgstr "Omschrijving"
+msgstr ""
 
 #. module: hr
 #: help:hr.installer,hr_contract:0
 msgid "Extends employee profiles to help manage their contracts."
 msgstr ""
-"Verruimt medewerker profielen voor beheer van hun arbeidsovereenkomsten."
 
 #. module: hr
 #: field:hr.installer,hr_payroll:0
 msgid "Payroll"
-msgstr "Loonlijst"
+msgstr ""
 
 #. module: hr
 #: field:hr.job,name:0
 msgid "Job Name"
-msgstr "Functienaam"
+msgstr ""
 
 #. module: hr
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Position"
-msgstr "Is vervuld"
+msgstr ""
 
 #. module: hr
 #: view:hr.department:0
 msgid "department"
-msgstr "afdeling"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,country_id:0
 msgid "Nationality"
-msgstr "Nationaliteit"
+msgstr ""
 
 #. module: hr
 #: view:hr.department:0
 #: view:hr.employee:0
 #: field:hr.employee,notes:0
 msgid "Notes"
-msgstr "Opmerkingen"
+msgstr ""
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_installer
 msgid "hr.installer"
-msgstr "hr.installer"
+msgstr ""
 
 #. module: hr
 #: view:board.board:0
 msgid "HR Manager Board"
-msgstr "HR manager board"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,resource_id:0
 msgid "Resource"
-msgstr "Resource"
+msgstr ""
 
 #. module: hr
 #: field:hr.department,complete_name:0
 #: field:hr.employee.category,complete_name:0
 msgid "Name"
-msgstr "Naam"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,gender:0
 msgid "Gender"
-msgstr "Sexe"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
@@ -704,49 +702,49 @@ msgstr "Sexe"
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_configuration_form
 msgid "Employees"
-msgstr "Medewerkers"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
 msgid "Bank Account"
-msgstr "Bankrekening"
+msgstr ""
 
 #. module: hr
 #: field:hr.department,name:0
 msgid "Department Name"
-msgstr "Naam afdeling"
+msgstr ""
 
 #. module: hr
 #: help:hr.employee,ssnid:0
 msgid "Social Security Number"
-msgstr "SOFI nummer"
+msgstr ""
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Creation of a OpenERP user"
-msgstr "OpenERP gebruiker aanmaken"
+msgstr ""
 
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
-msgstr "Sub-afdelingen"
+msgstr ""
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_job
 #: model:ir.ui.menu,name:hr.menu_hr_job
 msgid "Job Positions"
-msgstr "Vacatures"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,coach_id:0
 msgid "Coach"
-msgstr "Coach"
+msgstr ""
 
 #. module: hr
 #: field:hr.installer,hr_expense:0
 msgid "Expenses"
-msgstr "Declaraties"
+msgstr ""
 
 #. module: hr
 #: view:hr.department:0
@@ -754,128 +752,27 @@ msgstr "Declaraties"
 #: view:hr.employee:0
 #: field:hr.employee,parent_id:0
 msgid "Manager"
-msgstr "Manager"
+msgstr ""
 
 #. module: hr
 #: help:hr.installer,hr_payroll_account:0
 msgid "Generic Payroll system Integrated with Accountings."
-msgstr "Algemeen loonlijst systeem met geïntegreerde boekhouding."
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
-msgstr "Ondergeschikten"
+msgstr ""
 
-#~ msgid "Sunday"
-#~ msgstr "Zondag"
-
-#~ msgid "Work Email"
-#~ msgstr "E-mail werk"
-
-#~ msgid "Group name"
-#~ msgstr "Groepsnaam"
-
-#~ msgid "Friday"
-#~ msgstr "Vrijdag"
-
-#~ msgid "Work from"
-#~ msgstr "Werkt van"
-
-#~ msgid "Workgroup manager"
-#~ msgstr "Manager"
-
-#~ msgid "Fill up contact information"
-#~ msgstr "Vul contactinformatie in"
-
-#~ msgid "Divorced"
-#~ msgstr "Gescheiden"
-
-#~ msgid "Create openerp user"
-#~ msgstr "Maak een OpenERP gebruiker aan"
-
-#~ msgid "Tuesday"
-#~ msgstr "Dinsdag"
-
-#~ msgid "Related User"
-#~ msgstr "Gekoppelde gebruiker"
-
-#~ msgid "Monday"
-#~ msgstr "Maandag"
-
-#~ msgid "Wednesday"
-#~ msgstr "Woensdag"
-
-#~ msgid "Starting date"
-#~ msgstr "Startdatum"
-
-#~ msgid "Working Time"
-#~ msgstr "Werktijd"
-
-#~ msgid "Thursday"
-#~ msgstr "Donderdag"
-
-#~ msgid "Work to"
-#~ msgstr "Werkt tot"
-
-#~ msgid "Other"
-#~ msgstr "Overig"
-
-#~ msgid "Other ID"
-#~ msgstr "Ander ID"
-
-#~ msgid "Job Information"
-#~ msgstr "Functieomschrijving"
-
-#~ msgid "Saturday"
-#~ msgstr "Zaterdag"
-
-#~ msgid "New Employee"
-#~ msgstr "Nieuwe werknemer"
-
-#~ msgid "Parent Users"
-#~ msgstr "Bovenliggende gebruikers"
-
-#~ msgid "Parents"
-#~ msgstr "Bovenliggende"
-
-#~ msgid "Contact  of employee"
-#~ msgstr "Contactpersoon werknemer"
-
-#~ msgid "Working Time Categories"
-#~ msgstr "Werktijdcategorieën"
-
-#~ msgid "Unmaried"
-#~ msgstr "Ongehuwd"
-
-#~ msgid "Maried"
-#~ msgstr "Gehuwd"
-
-#~ msgid "Day of week"
-#~ msgstr "Dag van de week"
-
-#~ msgid "Employee Contract Process"
-#~ msgstr "Contractproces werknemer"
-
-#~ msgid "Timesheet Line"
-#~ msgstr "Regel urenstaat"
-
-#~ msgid "All Employees"
-#~ msgstr "Alle werknemers"
-
-#~ msgid "Fill up employee's contact information"
-#~ msgstr "Vul de contactgegevens van de werknemer in"
-
-#~ msgid "Employee Complete Form"
-#~ msgstr "Maak werknemersformulier compleet"
-
-#~ msgid "Working Time Category"
-#~ msgstr "Werktijd categorie"
-
-#~ msgid "Employee's timesheet group"
-#~ msgstr "Werknemers urenstaatgroep"
-
-#~ msgid "Create OpenERP User"
-#~ msgstr "Maak een OpenERP gebruiker aan"
-
-#~ msgid "Birthday"
-#~ msgstr "Geboortedatum"
+#~ 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 karakters bevatten !"
diff --git a/addons/hr/i18n/pl.po b/addons/hr/i18n/pl.po
index e5ecbeb06ed..0f9419d048b 100644
--- a/addons/hr/i18n/pl.po
+++ b/addons/hr/i18n/pl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-26 08: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-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr "Grupuj wg..."
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -281,11 +276,6 @@ msgstr "Pracownik"
 msgid "Other information"
 msgstr "Inne informacje"
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Adres do pracy"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -339,11 +329,6 @@ msgstr "Kategorie"
 msgid "Expected Employees"
 msgstr "Spodziewana liczba pracowników"
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -433,6 +418,21 @@ msgstr "Proces rekrutacji"
 msgid "Category"
 msgstr "Kategoria"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -443,15 +443,20 @@ msgstr "Konto bankowe pracownika dla płacy"
 msgid "Note"
 msgstr "Notatka"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Informacje kontaktowe"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Adres do pracy"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -463,6 +468,14 @@ msgstr "Konsola Dyrektora kadr"
 msgid "Status"
 msgstr "Stan"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -526,6 +539,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -571,14 +589,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr "Informacje osobiste"
 
-#. module: hr
-#: 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: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -753,6 +763,14 @@ msgstr "Menedżer"
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
@@ -764,9 +782,18 @@ msgstr "Podlegli"
 #~ msgid "Friday"
 #~ msgstr "Piątek"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
 #~ msgid "Divorced"
 #~ msgstr "Rozwiedziony"
 
+#~ 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 "Working Time Categories"
 #~ msgstr "Kategorie czasu pracy"
 
@@ -860,6 +887,9 @@ msgstr "Podlegli"
 #~ msgid "Fill up employee's contact information"
 #~ msgstr "Wypełnij informacje kontaktowe pracownika"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
 #~ msgid "Other"
 #~ msgstr "Inny"
 
@@ -871,3 +901,6 @@ msgstr "Podlegli"
 
 #~ msgid "Other ID"
 #~ msgstr "Inne ID"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
diff --git a/addons/hr/i18n/pt.po b/addons/hr/i18n/pt.po
index d5bb1ba29c0..f087b8a2be1 100644
--- a/addons/hr/i18n/pt.po
+++ b/addons/hr/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-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index cf333767326..00039c014f3 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/i18n/pt_BR.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-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/ro.po b/addons/hr/i18n/ro.po
index 16ee2c11444..91c556f42f6 100644
--- a/addons/hr/i18n/ro.po
+++ b/addons/hr/i18n/ro.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 04:57+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-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nume invalid de model în definirea acţiunii"
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -277,11 +272,6 @@ msgstr "Angajat"
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Adresă serviciu"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -335,11 +325,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invalid pentru arhitectura machetei de afișare !"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -429,6 +414,21 @@ msgstr ""
 msgid "Category"
 msgstr "Categorie"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -439,15 +439,20 @@ msgstr ""
 msgid "Note"
 msgstr "Notă"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Informații de contact"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Adresă serviciu"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -459,6 +464,14 @@ msgstr ""
 msgid "Status"
 msgstr "Stare"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -522,6 +535,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -567,14 +585,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr "Informații personale"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
-"special !"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -749,6 +759,14 @@ msgstr "Manager"
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
@@ -835,6 +853,9 @@ msgstr "Subordonaţi"
 #~ msgid "Contact  of employee"
 #~ msgstr "Contact angajat"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nume invalid de model în definirea acţiunii"
+
 #~ msgid "Working Time Categories"
 #~ msgstr "Categorii program de lucru"
 
@@ -844,6 +865,9 @@ msgstr "Subordonaţi"
 #~ msgid "Fill up contact information"
 #~ msgstr "Completarei informaţii de contact"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invalid pentru arhitectura machetei de afișare !"
+
 #~ msgid "Related User"
 #~ msgstr "Utilizator asociat"
 
@@ -856,6 +880,12 @@ msgstr "Subordonaţi"
 #~ msgid "Starting date"
 #~ msgstr "Data de început"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
+#~ "special !"
+
 #~ msgid "Working Time"
 #~ msgstr "Program de lucru"
 
diff --git a/addons/hr/i18n/ru.po b/addons/hr/i18n/ru.po
index 4fdde68b50f..9664a21588f 100644
--- a/addons/hr/i18n/ru.po
+++ b/addons/hr/i18n/ru.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-29 10:39+0000\n"
 "Last-Translator: Paul Korotkov <korotkov.paul@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-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия"
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -277,11 +272,6 @@ msgstr "Сотрудник"
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Рабочий адрес"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -335,11 +325,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -429,6 +414,21 @@ msgstr ""
 msgid "Category"
 msgstr "Категория"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -439,15 +439,20 @@ msgstr ""
 msgid "Note"
 msgstr "Примечание"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Контактная информация"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Рабочий адрес"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -459,6 +464,14 @@ msgstr ""
 msgid "Status"
 msgstr "Статус"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -522,6 +535,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -567,14 +585,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr "Персональная информация"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -749,6 +759,14 @@ msgstr "Менеджер"
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
@@ -781,6 +799,9 @@ msgstr "Подчиненные"
 #~ msgid "Workgroup manager"
 #~ msgstr "Руководитель группы"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра архитектуры!"
+
 #~ msgid "Divorced"
 #~ msgstr "В разводе"
 
@@ -811,6 +832,12 @@ msgstr "Подчиненные"
 #~ msgid "Timesheet Line"
 #~ msgstr "Строка табеля"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
+
 #~ msgid "Working Time"
 #~ msgstr "Рабочее время"
 
@@ -862,6 +889,9 @@ msgstr "Подчиненные"
 #~ msgid "Fill up employee's contact information"
 #~ msgstr "Заполните контактную информацию о сотруднике"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Недопустимое имя модели в определении действия"
+
 #~ msgid "Contact  of employee"
 #~ msgstr "Контакты сотрудника"
 
diff --git a/addons/hr/i18n/sk.po b/addons/hr/i18n/sk.po
index 7e7a3e68f54..7050699bfe6 100644
--- a/addons/hr/i18n/sk.po
+++ b/addons/hr/i18n/sk.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 04:57+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -64,11 +64,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Neplatný názov modelu v definícii akcie."
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -278,11 +273,6 @@ msgstr "Zamestnanec"
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Pracovná adresa"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -336,11 +326,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neplatné XML pre zobrazenie architektúry!"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -430,6 +415,21 @@ msgstr ""
 msgid "Category"
 msgstr "Kategória"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -440,15 +440,20 @@ msgstr ""
 msgid "Note"
 msgstr "Poznámka"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Kontaktné informácie"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Pracovná adresa"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -460,6 +465,14 @@ msgstr ""
 msgid "Status"
 msgstr "Stav"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -523,6 +536,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -568,13 +586,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr "Osobné informácie"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Názov objektu musí začínať x_ a nesmie obsahovať žiadne špeciálne znaky!"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -749,6 +760,14 @@ msgstr "Manažér"
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
@@ -763,6 +782,9 @@ msgstr "Podriadený"
 #~ msgid "Parents"
 #~ msgstr "Rodičia"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neplatný názov modelu v definícii akcie."
+
 #~ msgid "Contact  of employee"
 #~ msgstr "Kontakt na zamestnanca"
 
@@ -823,6 +845,11 @@ msgstr "Podriadený"
 #~ msgid "Parent Users"
 #~ msgstr "Nadradení používatelia"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Názov objektu musí začínať x_ a nesmie obsahovať žiadne špeciálne znaky!"
+
 #~ msgid "Working Time"
 #~ msgstr "Pracovný čas"
 
@@ -846,3 +873,6 @@ msgstr "Podriadený"
 
 #~ msgid "All Employees"
 #~ msgstr "Všetci zamestnanci"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neplatné XML pre zobrazenie architektúry!"
diff --git a/addons/hr/i18n/sl.po b/addons/hr/i18n/sl.po
index bfa067cc2eb..32d17133df6 100644
--- a/addons/hr/i18n/sl.po
+++ b/addons/hr/i18n/sl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 04:58+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Napačno ime modela v definiciji dejanja."
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -277,11 +272,6 @@ msgstr "Zaposleni"
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Delovni naslov"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -335,11 +325,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -429,6 +414,21 @@ msgstr ""
 msgid "Category"
 msgstr "Kategorija"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -439,15 +439,20 @@ msgstr ""
 msgid "Note"
 msgstr "Opomba"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Podatki o stiku"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Delovni naslov"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -459,6 +464,14 @@ msgstr ""
 msgid "Status"
 msgstr "Stanje"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -522,6 +535,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -567,13 +585,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr "Osebni podatki"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -748,6 +759,14 @@ msgstr "Upravitelj"
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
@@ -768,6 +787,9 @@ msgstr "Podrejeni"
 #~ msgid "Unmaried"
 #~ msgstr "Neporočen"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda."
+
 #~ msgid "Divorced"
 #~ msgstr "Razvezan"
 
@@ -789,6 +811,11 @@ msgstr "Podrejeni"
 #~ msgid "Wednesday"
 #~ msgstr "sreda"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
+
 #~ msgid "Thursday"
 #~ msgstr "četrtek"
 
@@ -816,6 +843,9 @@ msgstr "Podrejeni"
 #~ msgid "All Employees"
 #~ msgstr "Vsi zaposleni"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Napačno ime modela v definiciji dejanja."
+
 #~ msgid "Work from"
 #~ msgstr "Dela od"
 
diff --git a/addons/hr/i18n/sq.po b/addons/hr/i18n/sq.po
index 6998926c0ed..9e743434146 100644
--- a/addons/hr/i18n/sq.po
+++ b/addons/hr/i18n/sq.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:36+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -64,11 +64,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -278,11 +273,6 @@ msgstr ""
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr ""
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -336,11 +326,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -430,6 +415,21 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -440,14 +440,19 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr ""
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: field:hr.employee,address_id:0
+msgid "Working Address"
 msgstr ""
 
 #. module: hr
@@ -460,6 +465,14 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -523,6 +536,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -568,12 +586,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -748,6 +760,14 @@ msgstr ""
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
diff --git a/addons/hr/i18n/sr.po b/addons/hr/i18n/sr.po
index 1e14634f746..86c3ca6cb41 100644
--- a/addons/hr/i18n/sr.po
+++ b/addons/hr/i18n/sr.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-14 07:54+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-15 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -64,11 +64,6 @@ msgstr "Grupisano Po..."
 msgid "Work E-mail"
 msgstr "Poslovni Email"
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Neispravno ime u definiciji akcije."
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -285,11 +280,6 @@ msgstr "Zaposleni"
 msgid "Other information"
 msgstr "Ostale Informacije"
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Adresa Posla"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -343,11 +333,6 @@ msgstr "Kategorije"
 msgid "Expected Employees"
 msgstr "Očekivani zapopljeni"
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neispravan XML za pregled arhitekture"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -439,6 +424,21 @@ msgstr "Proces Zapošljavanja"
 msgid "Category"
 msgstr "Kategorija"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -449,15 +449,20 @@ msgstr "Račun Banke Zapošljenog"
 msgid "Note"
 msgstr "Napomena"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Kontakt Info"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Greska ! Ne možeš kreirati rekursivni Meni."
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Adresa Posla"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -469,6 +474,14 @@ msgstr "Glavna tabla Menadžmenta Ljudskim Resursima"
 msgid "Status"
 msgstr "Status"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -534,6 +547,11 @@ msgstr "Staro"
 msgid "Status Description"
 msgstr "Opis Statusa"
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -579,13 +597,6 @@ msgstr "Platno Računovodstvo"
 msgid "Personal Information"
 msgstr "Lične informacije"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Ime objekta mora započeti sa x_ i ne sme sadržavati specijalne karaktere."
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -763,7 +774,29 @@ msgstr "Menadžer"
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr "Generički sistem Platnih spiskova integrisanih sa Računovodstvom."
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
 msgstr "Podređeni"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neispravno ime u definiciji akcije."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neispravan XML za pregled arhitekture"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Greska ! Ne možeš kreirati rekursivni Meni."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ime objekta mora započeti sa x_ i ne sme sadržavati specijalne karaktere."
diff --git a/addons/hr/i18n/sr@latin.po b/addons/hr/i18n/sr@latin.po
index eec3a4b5f25..200314ee67f 100644
--- a/addons/hr/i18n/sr@latin.po
+++ b/addons/hr/i18n/sr@latin.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-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/sv.po b/addons/hr/i18n/sv.po
index 3075a5ed4c4..38d7810d4f8 100644
--- a/addons/hr/i18n/sv.po
+++ b/addons/hr/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-23 09:33+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-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Invalid model name in the action definition."
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -254,11 +249,6 @@ msgstr "Underkategori"
 msgid "Job Description"
 msgstr ""
 
-#. module: hr
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
@@ -282,21 +272,11 @@ msgstr "Anställd"
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "adress"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
 msgstr ""
 
-#. module: hr
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
@@ -345,11 +325,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -423,11 +398,6 @@ msgstr ""
 msgid "hr.department"
 msgstr "hr.department"
 
-#. module: hr
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: hr
 #: help:hr.employee,parent_id:0
 msgid "It is linked with manager of Department"
@@ -469,15 +439,20 @@ msgstr ""
 msgid "Note"
 msgstr "Anteckning"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Kontaktinformation"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "adress"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -560,6 +535,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -605,13 +585,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr "Personlig information"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -835,6 +808,11 @@ msgstr "Underordnad"
 #~ msgid "Wednesday"
 #~ msgstr "Onsdag"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
 #~ msgid "Thursday"
 #~ msgstr "Torsdag"
 
@@ -910,5 +888,11 @@ msgstr "Underordnad"
 #~ msgid "Fill up employee's contact information"
 #~ msgstr "Fyll i den anställdes kontakt information"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Invalid model name in the action definition."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalid XML for View Architecture!"
+
 #~ msgid "Employee Complete Form"
 #~ msgstr "Employee Complete Form"
diff --git a/addons/hr/i18n/th.po b/addons/hr/i18n/th.po
index aa6072c9547..380046e4fa7 100644
--- a/addons/hr/i18n/th.po
+++ b/addons/hr/i18n/th.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-01-30 15:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Thai <th@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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -64,11 +64,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -278,11 +273,6 @@ msgstr ""
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr ""
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -336,11 +326,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -430,6 +415,21 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -440,14 +440,19 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr ""
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: field:hr.employee,address_id:0
+msgid "Working Address"
 msgstr ""
 
 #. module: hr
@@ -460,6 +465,14 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -523,6 +536,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -568,12 +586,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -748,6 +760,14 @@ msgstr ""
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
diff --git a/addons/hr/i18n/tlh.po b/addons/hr/i18n/tlh.po
index ae7fc3be52d..451105ab3a1 100644
--- a/addons/hr/i18n/tlh.po
+++ b/addons/hr/i18n/tlh.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -277,11 +272,6 @@ msgstr ""
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr ""
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -335,11 +325,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -429,6 +414,21 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -439,14 +439,19 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr ""
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: field:hr.employee,address_id:0
+msgid "Working Address"
 msgstr ""
 
 #. module: hr
@@ -459,6 +464,14 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -522,6 +535,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -567,12 +585,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -747,6 +759,14 @@ msgstr ""
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index 3f5ca895a33..16d02fbae98 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/i18n/tr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 12:04+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-10-31 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "İşlem tanımlamasında geçersiz model adı."
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -277,11 +272,6 @@ msgstr "Personel"
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "İş Adresi"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -335,11 +325,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -429,6 +414,21 @@ msgstr ""
 msgid "Category"
 msgstr "Kategori"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -439,15 +439,20 @@ msgstr ""
 msgid "Note"
 msgstr "Not"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "İletişim Bilgisi"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "İş Adresi"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -459,6 +464,14 @@ msgstr ""
 msgid "Status"
 msgstr "Durum"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -522,6 +535,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -567,12 +585,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr "Personel Bilgileri"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -747,11 +759,22 @@ msgstr "Yönetici"
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
+
 #~ msgid "Working Time Categories"
 #~ msgstr "Çalışma Süresi Kategorisi"
 
@@ -850,3 +873,6 @@ msgstr ""
 
 #~ msgid "Wednesday"
 #~ msgstr "Çarşamba"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "İşlem tanımlamasında geçersiz model adı."
diff --git a/addons/hr/i18n/uk.po b/addons/hr/i18n/uk.po
index 5b9ed8fecd7..38308b4de71 100644
--- a/addons/hr/i18n/uk.po
+++ b/addons/hr/i18n/uk.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 12:00+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-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -277,11 +272,6 @@ msgstr "Співробітник"
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr ""
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -335,11 +325,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури Вигляду!"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -429,6 +414,21 @@ msgstr ""
 msgid "Category"
 msgstr "Категорія"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -439,14 +439,19 @@ msgstr ""
 msgid "Note"
 msgstr "Примітка"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr ""
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: field:hr.employee,address_id:0
+msgid "Working Address"
 msgstr ""
 
 #. module: hr
@@ -459,6 +464,14 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -522,6 +535,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -567,13 +585,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -748,6 +759,14 @@ msgstr "Керівник"
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
@@ -768,6 +787,9 @@ msgstr "Підлеглі"
 #~ msgid "Workgroup manager"
 #~ msgstr "Менеджер робочої групи"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильний XML для Архітектури Вигляду!"
+
 #~ msgid "Employee's timesheet group"
 #~ msgstr "Табельна група співробітника"
 
@@ -789,6 +811,11 @@ msgstr "Підлеглі"
 #~ msgid "Timesheet Line"
 #~ msgstr "Рядок табелю"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
+
 #~ msgid "Thursday"
 #~ msgstr "Четвер"
 
diff --git a/addons/hr/i18n/vi.po b/addons/hr/i18n/vi.po
index c3799dc14a4..26e28eb2c41 100644
--- a/addons/hr/i18n/vi.po
+++ b/addons/hr/i18n/vi.po
@@ -12,14 +12,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-22 07:23+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-11-23 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -69,11 +69,6 @@ msgstr "Nhóm theo"
 msgid "Work E-mail"
 msgstr "Địa chỉ thư điện tử công việc"
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Tên mô hình không hợp lệ trong định nghĩa hành động."
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -260,11 +255,6 @@ msgstr "Hạng mục con"
 msgid "Job Description"
 msgstr "Mô tả công việc"
 
-#. module: hr
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
@@ -288,21 +278,11 @@ msgstr "Nhân viên"
 msgid "Other information"
 msgstr "Thông tin khác"
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Địa chỉ làm việc"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
 msgstr ""
 
-#. module: hr
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
@@ -351,11 +331,6 @@ msgstr "Loại"
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML không hợp lệ để xem kiến trúc"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -429,11 +404,6 @@ msgstr ""
 msgid "hr.department"
 msgstr "hr.department"
 
-#. module: hr
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: hr
 #: help:hr.employee,parent_id:0
 msgid "It is linked with manager of Department"
@@ -475,15 +445,20 @@ msgstr ""
 msgid "Note"
 msgstr "Ghi chú"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Thông tin liên hệ"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Địa chỉ làm việc"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -566,6 +541,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -611,14 +591,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr "Thông tin cá nhân"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Tên đối tượng phải bắt đầu bằng x_ và không bao gồm bất kỳ ký tự đặc biệt "
-"nào!"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -890,6 +862,9 @@ msgstr "Người cấp dưới"
 #~ msgid "Parents"
 #~ msgstr "Cha mẹ"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Tên mô hình không hợp lệ trong định nghĩa hành động."
+
 #~ msgid "Contact  of employee"
 #~ msgstr "Thông tin liên hệ của nhân viên"
 
@@ -1048,6 +1023,9 @@ msgstr "Người cấp dưới"
 #~ msgid "Starting Date"
 #~ msgstr "Ngày bắt đầu"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML không hợp lệ để xem kiến trúc"
+
 #~ msgid "Divorced"
 #~ msgstr "Ly hôn"
 
@@ -1266,6 +1244,12 @@ msgstr "Người cấp dưới"
 #~ msgid "Choose your month"
 #~ msgstr "Chọn tháng của bạn"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Tên đối tượng phải bắt đầu bằng x_ và không bao gồm bất kỳ ký tự đặc biệt "
+#~ "nào!"
+
 #~ msgid ""
 #~ "No analytic journal available for this employee.\n"
 #~ "Define an employee for the selected user and assign an analytic journal."
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index f4255edead6..8e0b59250ab 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-09-09 07:22+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\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-10-30 05:42+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,17 +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 ""
-
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "在动作定义中使用了无效的模快名。"
+msgstr "工作电邮"
 
 #. module: hr
 #: view:hr.employee:0
@@ -85,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
@@ -100,7 +95,7 @@ msgstr ""
 #. module: hr
 #: view:hr.installer:0
 msgid "title"
-msgstr ""
+msgstr "职位"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -118,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
@@ -128,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
@@ -155,7 +150,7 @@ msgstr ""
 #. module: hr
 #: view:hr.employee:0
 msgid "My Departments Employee"
-msgstr ""
+msgstr "我的部门雇员"
 
 #. module: hr
 #: constraint:hr.employee:0
@@ -166,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
@@ -220,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
@@ -252,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
@@ -262,7 +257,7 @@ msgstr "办公地点"
 #. module: hr
 #: field:hr.employee,passport_id:0
 msgid "Passport"
-msgstr ""
+msgstr "护照"
 
 #. module: hr
 #: view:hr.employee:0
@@ -275,22 +270,17 @@ msgstr "员工"
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr ""
-
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-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
@@ -305,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
@@ -328,22 +318,17 @@ msgstr "设置"
 #. module: hr
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "分类"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效的视图结构xml文件!"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
-msgstr ""
+msgstr "社会保险号"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
@@ -353,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
@@ -372,7 +357,7 @@ msgstr "员工联系方式"
 #. module: hr
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "我的面板"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -394,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
@@ -421,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
@@ -429,40 +414,68 @@ msgstr ""
 msgid "Category"
 msgstr "分类"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr ""
+msgstr "员工工资帐号"
 
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
 msgstr "备注"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "联系信息"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+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
 msgid "Status"
 msgstr "状态"
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+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
@@ -473,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
@@ -515,12 +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 "两个用户不能使用相同的用户名！"
 
 #. module: hr
 #: view:hr.job:0
@@ -550,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
@@ -567,16 +585,10 @@ msgstr ""
 msgid "Personal Information"
 msgstr "个人信息"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "当前活动"
 
 #. module: hr
 #: help:hr.installer,hr_expense:0
@@ -588,7 +600,7 @@ msgstr ""
 #. module: hr
 #: view:hr.job:0
 msgid "Current"
-msgstr ""
+msgstr "当前的"
 
 #. module: hr
 #: field:hr.department,parent_id:0
@@ -609,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
@@ -663,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
@@ -695,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
@@ -705,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
@@ -721,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
@@ -732,7 +744,7 @@ msgstr ""
 #. module: hr
 #: field:hr.installer,hr_expense:0
 msgid "Expenses"
-msgstr ""
+msgstr "支出"
 
 #. module: hr
 #: view:hr.department:0
@@ -747,6 +759,14 @@ msgstr "主管"
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
@@ -882,5 +902,15 @@ msgstr "下属"
 #~ msgid "Saturday"
 #~ msgstr "六"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "在动作定义中使用了无效的模快名。"
+
 #~ msgid "Work Email"
 #~ msgstr "工作Email"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效的视图结构xml文件!"
diff --git a/addons/hr/i18n/zh_TW.po b/addons/hr/i18n/zh_TW.po
index 66779390400..f9501d85e35 100644
--- a/addons/hr/i18n/zh_TW.po
+++ b/addons/hr/i18n/zh_TW.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-01-30 13:21+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-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr ""
 msgid "Work E-mail"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -277,11 +272,6 @@ msgstr ""
 msgid "Other information"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr ""
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
@@ -335,11 +325,6 @@ msgstr ""
 msgid "Expected Employees"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -429,6 +414,21 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
@@ -439,14 +439,19 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr ""
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: field:hr.employee,address_id:0
+msgid "Working Address"
 msgstr ""
 
 #. module: hr
@@ -459,6 +464,14 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
@@ -522,6 +535,11 @@ msgstr ""
 msgid "Status Description"
 msgstr ""
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -567,12 +585,6 @@ msgstr ""
 msgid "Personal Information"
 msgstr ""
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -747,6 +759,14 @@ msgstr ""
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
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/ar.po b/addons/hr_attendance/i18n/ar.po
index dbaeff43a08..e858532b5c5 100644
--- a/addons/hr_attendance/i18n/ar.po
+++ b/addons/hr_attendance/i18n/ar.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,11 +170,6 @@ msgstr ""
 msgid "Attendance"
 msgstr ""
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -220,11 +208,6 @@ msgstr ""
 msgid "Starting Date"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -294,13 +277,16 @@ msgid "Sign in / Sign out"
 msgstr ""
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -339,6 +325,11 @@ msgstr ""
 msgid "November"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -383,9 +374,12 @@ msgid "Action"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -407,12 +401,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -447,6 +435,14 @@ msgstr ""
 msgid "Employee"
 msgstr ""
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -481,6 +477,15 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -522,8 +527,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/bg.po b/addons/hr_attendance/i18n/bg.po
index 0ede3ad6ead..6babc7b6ed4 100644
--- a/addons/hr_attendance/i18n/bg.po
+++ b/addons/hr_attendance/i18n/bg.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-04 06:32+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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,11 +170,6 @@ msgstr ""
 msgid "Attendance"
 msgstr ""
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -220,11 +208,6 @@ msgstr ""
 msgid "Starting Date"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -294,13 +277,16 @@ msgid "Sign in / Sign out"
 msgstr ""
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -339,6 +325,11 @@ msgstr ""
 msgid "November"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -383,9 +374,12 @@ msgid "Action"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -407,14 +401,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-"символи!"
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -449,6 +435,14 @@ msgstr ""
 msgid "Employee"
 msgstr ""
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -483,6 +477,15 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -524,8 +527,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
@@ -544,3 +548,12 @@ msgstr ""
 #: view:hr.sign.in.out.ask:0
 msgid "hr.sign.in.out.ask"
 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 за преглед на архитектурата"
diff --git a/addons/hr_attendance/i18n/bs.po b/addons/hr_attendance/i18n/bs.po
index b3c7f2cad08..52e5bdbf5e7 100644
--- a/addons/hr_attendance/i18n/bs.po
+++ b/addons/hr_attendance/i18n/bs.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-04 06:32+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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,11 +170,6 @@ msgstr ""
 msgid "Attendance"
 msgstr ""
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -220,11 +208,6 @@ msgstr ""
 msgid "Starting Date"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -294,13 +277,16 @@ msgid "Sign in / Sign out"
 msgstr ""
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -339,6 +325,11 @@ msgstr ""
 msgid "November"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -383,9 +374,12 @@ msgid "Action"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -407,12 +401,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -447,6 +435,14 @@ msgstr ""
 msgid "Employee"
 msgstr ""
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -481,6 +477,15 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -522,8 +527,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
@@ -542,3 +548,6 @@ msgstr ""
 #: view:hr.sign.in.out.ask:0
 msgid "hr.sign.in.out.ask"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
diff --git a/addons/hr_attendance/i18n/ca.po b/addons/hr_attendance/i18n/ca.po
index 0962bb80544..a3ca05ffd6c 100644
--- a/addons/hr_attendance/i18n/ca.po
+++ b/addons/hr_attendance/i18n/ca.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 09:39+0000\n"
 "Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@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-10-31 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de model no vàlid en la definició de l'acció."
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr "Defineix motiu absència"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,12 +170,6 @@ msgstr "Un registre d'entrada ha d'estar després d'un registre de sortida!"
 msgid "Attendance"
 msgstr "Assistència"
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-"Està llest per registrar les entrades i sortides en el control de assistència"
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -223,11 +210,6 @@ msgstr "Informe errors d'assistència"
 msgid "Starting Date"
 msgstr "Data inicial"
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -297,13 +279,16 @@ msgid "Sign in / Sign out"
 msgstr "Registra entrada/sortida"
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -342,6 +327,11 @@ msgstr "Data"
 msgid "November"
 msgstr "Novembre"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -386,10 +376,13 @@ msgid "Action"
 msgstr "Acció"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
-msgstr "No s'han trobat registres en la seva selecció!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
+msgstr ""
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
@@ -410,14 +403,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-"especial!"
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -454,6 +439,14 @@ msgstr "Retard"
 msgid "Employee"
 msgstr "Empleat"
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -488,6 +481,15 @@ msgstr "El seu últim registre entrada"
 msgid "Sign Out"
 msgstr "Registra sortida"
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -530,9 +532,10 @@ msgstr ""
 "Encara que indiqueu aquest retard, es considera que l'error és voluntari"
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
+msgstr "No s'han trobat registres en la seva selecció!"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -557,6 +560,19 @@ msgstr ""
 #~ msgid "Print Attendance Report"
 #~ msgstr "Imprimeix informe assistència"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+#~ "especial!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invàlid per a la definició de la vista!"
+
+#~ msgid "You are now ready to sign in or out of the attendance follow up"
+#~ msgstr ""
+#~ "Està llest per registrar les entrades i sortides en el control de assistència"
+
 #~ msgid "Employee's name"
 #~ msgstr "Nom d'empleat"
 
@@ -584,6 +600,9 @@ msgstr ""
 #~ msgid "Select a month"
 #~ msgstr "Seleccioneu un mes"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom de model no vàlid en la definició de l'acció."
+
 #~ msgid ""
 #~ "You did not signed out the last time. Please enter the date and time you "
 #~ "signed out."
diff --git a/addons/hr_attendance/i18n/cs.po b/addons/hr_attendance/i18n/cs.po
index 69923f7bb4a..b91f510793c 100644
--- a/addons/hr_attendance/i18n/cs.po
+++ b/addons/hr_attendance/i18n/cs.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-17 07:22+0000\n"
 "Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,13 +170,6 @@ msgstr ""
 msgid "Attendance"
 msgstr ""
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-"Teď jste schopni se přihlašovat/odhlašovat(You are now ready to sign in or "
-"out of the attendance follow up)"
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -222,11 +208,6 @@ msgstr ""
 msgid "Starting Date"
 msgstr "Počáteční datum"
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -296,13 +277,16 @@ msgid "Sign in / Sign out"
 msgstr "Přihlásit / Odhlásit"
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -341,6 +325,11 @@ msgstr ""
 msgid "November"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -385,9 +374,12 @@ msgid "Action"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -409,12 +401,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Storno"
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -449,6 +435,14 @@ msgstr ""
 msgid "Employee"
 msgstr ""
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -483,6 +477,15 @@ msgstr "Naposledy jste se přihlásil"
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -524,8 +527,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
@@ -545,6 +549,11 @@ msgstr ""
 msgid "hr.sign.in.out.ask"
 msgstr ""
 
+#~ msgid "You are now ready to sign in or out of the attendance follow up"
+#~ msgstr ""
+#~ "Teď jste schopni se přihlašovat/odhlašovat(You are now ready to sign in or "
+#~ "out of the attendance follow up)"
+
 #~ msgid "Employee's name"
 #~ msgstr "Jméno zaměstnance(Employee's name)"
 
diff --git a/addons/hr_attendance/i18n/de.po b/addons/hr_attendance/i18n/de.po
index c367552b907..0c5162ac171 100644
--- a/addons/hr_attendance/i18n/de.po
+++ b/addons/hr_attendance/i18n/de.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/el.po b/addons/hr_attendance/i18n/el.po
index e3f52901420..594dd82f817 100644
--- a/addons/hr_attendance/i18n/el.po
+++ b/addons/hr_attendance/i18n/el.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 05:27+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -29,24 +29,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -122,6 +109,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr "Ορισμός Αιτιολογίας Παρουσιολογίου"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -180,12 +173,6 @@ msgstr "Προσέλευση αμέσως μετά την Αναχώρηση !"
 msgid "Attendance"
 msgstr "Παρουσίες"
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-"Είστε έτοιμοι να εισαχθείτε ή να εξέλθετε από την Επαλήθευση Παρουσιών"
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -226,11 +213,6 @@ msgstr "Σφάλματα Παρουσιολογίου"
 msgid "Starting Date"
 msgstr "Ημερομηνία Εκκίνησης"
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -300,13 +282,16 @@ msgid "Sign in / Sign out"
 msgstr "Προσέλευση / Αναχώρηση"
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -345,6 +330,11 @@ msgstr "Ημερομηνία"
 msgid "November"
 msgstr "Νοέμβριος"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -389,9 +379,12 @@ msgid "Action"
 msgstr "Κίνηση"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -413,13 +406,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες!"
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -456,6 +442,14 @@ msgstr "Καθυστέρηση"
 msgid "Employee"
 msgstr "Υπάλληλος"
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -490,6 +484,15 @@ msgstr "Τελευταία Προσέλευση:"
 msgid "Sign Out"
 msgstr "Αναχώρηση"
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -531,8 +534,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr "Πέραν αυτής της καθυστέρησης, το σφάλμα θεωρείται εκούσιο"
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
@@ -560,6 +564,13 @@ msgstr ""
 #~ "Η ημερομηνία που χρησιμοποιείτε είναι προγενέστερη!\n"
 #~ "Παρακαλώ επικοινωνήστε με τον υπεύθυνο για διόρθωση των παρουσιών."
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalid XML for View Architecture!"
+
+#~ msgid "You are now ready to sign in or out of the attendance follow up"
+#~ msgstr ""
+#~ "Είστε έτοιμοι να εισαχθείτε ή να εξέλθετε από την Επαλήθευση Παρουσιών"
+
 #~ msgid "Employee's name"
 #~ msgstr "Όνομα Υπαλλήλου"
 
@@ -600,6 +611,11 @@ msgstr ""
 #~ "Η ημερομηνία που χρησιμοποιείτε είναι προγενέστερη!\n"
 #~ "Παρακαλώ επικοινωνήστε με τον υπεύθυνο για διόρθωση των παρουσιών."
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες!"
+
 #~ msgid "Print Timesheet"
 #~ msgstr "Εκτύπωση Φύλλου Xρόνου Eργασίας"
 
@@ -622,3 +638,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Δεν έχετε εισαχθεί στο σύστημα. Παρακαλώ καταχωρήστε την Ημερ/νία και ώρα "
 #~ "Προσέλευσής σας."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
diff --git a/addons/hr_attendance/i18n/es.po b/addons/hr_attendance/i18n/es.po
index acfd375cbac..84a58b4d3a6 100644
--- a/addons/hr_attendance/i18n/es.po
+++ b/addons/hr_attendance/i18n/es.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-12-05 07:59+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\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-09 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/es_AR.po b/addons/hr_attendance/i18n/es_AR.po
index 010f467b293..2700f79da3a 100644
--- a/addons/hr_attendance/i18n/es_AR.po
+++ b/addons/hr_attendance/i18n/es_AR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-15 20:45+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr "Defina motivo de asistencia"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,13 +170,6 @@ msgstr "Un registro de entrada debe estar después de un registro de salida !"
 msgid "Attendance"
 msgstr "Asistencia"
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-"Ud. está listo para registrar las entradas o salidas en el control de "
-"asistencia"
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -224,11 +210,6 @@ msgstr "Informe de errores de asistencia"
 msgid "Starting Date"
 msgstr "Fecha de inicio"
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista!"
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -298,13 +279,16 @@ msgid "Sign in / Sign out"
 msgstr "Registrar entrada/salida"
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -343,6 +327,11 @@ msgstr "Fecha"
 msgid "November"
 msgstr "Noviembre"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -387,9 +376,12 @@ msgid "Action"
 msgstr "Acción"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -411,14 +403,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
-"especial!"
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -455,6 +439,14 @@ msgstr "Retraso"
 msgid "Employee"
 msgstr "Empleado"
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -489,6 +481,15 @@ msgstr "Su último registro de entrada"
 msgid "Sign Out"
 msgstr "Registrar salida"
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -530,8 +531,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr "Aunque indique esta demora, se considera que el error es voluntario"
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/es_EC.po b/addons/hr_attendance/i18n/es_EC.po
index 03df3a7eafd..8030266ebd2 100644
--- a/addons/hr_attendance/i18n/es_EC.po
+++ b/addons/hr_attendance/i18n/es_EC.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-19 00:01+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -27,24 +27,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -120,6 +107,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr "Defina motivo ausencia"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -178,12 +171,6 @@ msgstr ""
 msgid "Attendance"
 msgstr "Asistencia"
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-"Está listo para registrar las entradas y salidas en el control de asistencia"
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -224,11 +211,6 @@ msgstr "Informe errores de asistencia"
 msgid "Starting Date"
 msgstr "Fecha inicial"
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -298,13 +280,16 @@ msgid "Sign in / Sign out"
 msgstr "Registrar entrada/salida"
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -343,6 +328,11 @@ msgstr "Fecha"
 msgid "November"
 msgstr "Noviembre"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -387,9 +377,12 @@ msgid "Action"
 msgstr "Acción"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -411,14 +404,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -455,6 +440,14 @@ msgstr "Retraso"
 msgid "Employee"
 msgstr "Empleado"
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -489,6 +482,15 @@ msgstr "Su último registro entrada"
 msgid "Sign Out"
 msgstr "Registrar salida"
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -530,8 +532,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr "Aunque indique esta demora, se considera que el error es voluntario"
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/et.po b/addons/hr_attendance/i18n/et.po
index 9114fde2ec9..405038c2459 100644
--- a/addons/hr_attendance/i18n/et.po
+++ b/addons/hr_attendance/i18n/et.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 13:57+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-10-31 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr "Määratle kohalviibimise põhjus"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,12 +170,6 @@ msgstr ""
 msgid "Attendance"
 msgstr "Kohalviibimine"
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-"Sa oled nüüd valmis sisse või välja logima kohalviibimise täiendusele"
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -223,11 +210,6 @@ msgstr "Kohalviibimise veaaruanne"
 msgid "Starting Date"
 msgstr "Alguskuupäev"
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -297,13 +279,16 @@ msgid "Sign in / Sign out"
 msgstr "Logi Sisse / Välja"
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -342,6 +327,11 @@ msgstr "Kuupäev"
 msgid "November"
 msgstr "November"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -386,10 +376,13 @@ msgid "Action"
 msgstr "Toiming"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
-msgstr "Sinu valikus ei leitud kirjeid."
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
+msgstr ""
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
@@ -410,13 +403,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Tühista"
 
-#. module: hr_attendance
-#: 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: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -452,6 +438,14 @@ msgstr "Viivitus"
 msgid "Employee"
 msgstr "Töötaja"
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -486,6 +480,15 @@ msgstr "Sinu viimane sisse logimine"
 msgid "Sign Out"
 msgstr "Logi välja"
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -527,9 +530,10 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr "Allpool seda viivitust loetakse viga tahtlikuks."
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
+msgstr "Sinu valikus ei leitud kirjeid."
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -548,12 +552,27 @@ msgstr "Aasta"
 msgid "hr.sign.in.out.ask"
 msgstr ""
 
+#~ 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 "Print Timesheet"
 #~ msgstr "Prindi tööajaleht"
 
 #~ msgid "Employee's name"
 #~ msgstr "Töötaja nimi"
 
+#~ msgid "You are now ready to sign in or out of the attendance follow up"
+#~ msgstr ""
+#~ "Sa oled nüüd valmis sisse või välja logima kohalviibimise täiendusele"
+
 #~ msgid "Print Attendance Error Report"
 #~ msgstr "Prindi kohalviibimise veaaruanne"
 
diff --git a/addons/hr_attendance/i18n/fi.po b/addons/hr_attendance/i18n/fi.po
index ae2b2a5a18b..2288224d4b1 100644
--- a/addons/hr_attendance/i18n/fi.po
+++ b/addons/hr_attendance/i18n/fi.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-09 07:20+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -27,24 +27,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -120,6 +107,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -178,11 +171,6 @@ msgstr ""
 msgid "Attendance"
 msgstr ""
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -221,11 +209,6 @@ msgstr ""
 msgid "Starting Date"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -295,13 +278,16 @@ msgid "Sign in / Sign out"
 msgstr "Kirjaudu sisään / Kirjaudu ulos"
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -340,6 +326,11 @@ msgstr ""
 msgid "November"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -384,9 +375,12 @@ msgid "Action"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -408,12 +402,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -450,6 +438,14 @@ msgstr "Viive"
 msgid "Employee"
 msgstr ""
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -484,6 +480,15 @@ msgstr "Viimeisin kirjautuminen"
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -525,8 +530,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/fr.po b/addons/hr_attendance/i18n/fr.po
index 9252a728269..3f437a8df79 100644
--- a/addons/hr_attendance/i18n/fr.po
+++ b/addons/hr_attendance/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:12+0000\n"
-"PO-Revision-Date: 2010-11-27 14:39+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\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-11-28 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -37,18 +37,13 @@ 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
 msgid "Group By..."
 msgstr "Regrouper par..."
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de modèle non valide dans la définition de l'action."
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
@@ -65,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
@@ -79,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
@@ -88,11 +85,9 @@ msgid "The sign-out date must be in the past"
 msgstr "La date du pointage de la sortie doit être située dans le passé"
 
 #. module: hr_attendance
-#: selection:hr.action.reason,action_type:0
-#: view:hr.sign.in.out:0
-#: view:hr.sign.in.out.ask:0
-msgid "Sign in"
-msgstr "Pointer l'entrée"
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Signed"
+msgstr "Date de pointage"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
@@ -131,10 +126,16 @@ msgstr "Ok"
 msgid "Define attendance reason"
 msgstr "Définir les motifs de pointage"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+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
@@ -182,22 +183,12 @@ msgstr "Présence"
 msgid "Max. Delay (Min)"
 msgstr "Retard max (Min)"
 
-#. module: hr_attendance
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 #: view:hr.attendance.month:0
 msgid "Print"
 msgstr "Imprimer"
 
-#. module: hr_attendance
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Hr Attendance Search"
@@ -227,11 +218,6 @@ msgstr "Rapport des erreurs de pointage"
 msgid "Starting Date"
 msgstr "Date de début"
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue !"
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -274,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
@@ -286,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
@@ -315,11 +302,6 @@ msgstr ""
 msgid "hr.sign.out.ask"
 msgstr "hr.sign.out.ask"
 
-#. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Erreur! Vous ne pouvez pas créer de menu récursif."
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "August"
@@ -350,6 +332,11 @@ msgstr "Date"
 msgid "November"
 msgstr "Novembre"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -358,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
@@ -366,9 +353,11 @@ msgid "January"
 msgstr "Janvier"
 
 #. module: hr_attendance
-#: report:report.hr.timesheet.attendance.error:0
-msgid "Date Signed"
-msgstr "Date de pointage"
+#: selection:hr.action.reason,action_type:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Sign in"
+msgstr "Pointer l'entrée"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -400,12 +389,6 @@ msgid ""
 "encode their time with this action button."
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
-msgstr "Aucun enregistrement trouvé pour votre sélection !"
-
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
 msgid "Print Week Attendance Report"
@@ -417,11 +400,6 @@ msgstr "Imprimer le rapport des présences par semaine"
 msgid "Empoyee ID"
 msgstr ""
 
-#. module: hr_attendance
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 #: view:hr.attendance.month:0
@@ -430,19 +408,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Annuler"
 
-#. module: hr_attendance
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Le nom de l'objet doit commencer par x_ et ne doit pas contenir de "
-"caractères spéciaux !"
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -571,9 +536,10 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr "En dessous de ce retard, l'erreur est considérée comme volontaire"
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Les règles ne sont pas compatibles avec les objets osv_memory !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
+msgstr "Aucun enregistrement trouvé pour votre sélection !"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -607,11 +573,23 @@ msgstr "hr.sign.in.out.ask"
 #~ msgid "Select a starting and a end date"
 #~ msgstr "Sélectionnez une date de début et de fin"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Le nom de l'objet doit commencer par x_ et ne doit pas contenir de "
+#~ "caractères spéciaux !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valide pour l'architecture de la vue !"
+
 #~ msgid "You are now ready to sign in or out of the attendance follow up"
 #~ msgstr ""
 #~ "Vous pouvez maintenant pointer votre entrée ou votre sortie dans le suivi de "
 #~ "présence"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom de modèle non valide dans la définition de l'action."
+
 #~ msgid ""
 #~ "You did not signed out the last time. Please enter the date and time you "
 #~ "signed out."
@@ -643,3 +621,9 @@ msgstr "hr.sign.in.out.ask"
 
 #~ msgid "This module aims to manage employee's attendances."
 #~ msgstr "Ce module vise à gérer les présences des employés."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Erreur! Vous ne pouvez pas créer de menu récursif."
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Les règles ne sont pas compatibles avec les objets osv_memory !"
diff --git a/addons/hr_attendance/i18n/hr.po b/addons/hr_attendance/i18n/hr.po
index f7044a4d7ca..d3f011f8f5d 100644
--- a/addons/hr_attendance/i18n/hr.po
+++ b/addons/hr_attendance/i18n/hr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 12:22+0000\n"
 "Last-Translator: mra (Open ERP) <mra@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-10-31 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,11 +170,6 @@ msgstr ""
 msgid "Attendance"
 msgstr ""
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -220,11 +208,6 @@ msgstr ""
 msgid "Starting Date"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -294,13 +277,16 @@ msgid "Sign in / Sign out"
 msgstr ""
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -339,6 +325,11 @@ msgstr ""
 msgid "November"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -383,9 +374,12 @@ msgid "Action"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -407,12 +401,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -447,6 +435,14 @@ msgstr ""
 msgid "Employee"
 msgstr ""
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -481,6 +477,15 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -522,8 +527,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
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/i18n/hu.po b/addons/hr_attendance/i18n/hu.po
index dbaeff43a08..e858532b5c5 100644
--- a/addons/hr_attendance/i18n/hu.po
+++ b/addons/hr_attendance/i18n/hu.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,11 +170,6 @@ msgstr ""
 msgid "Attendance"
 msgstr ""
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -220,11 +208,6 @@ msgstr ""
 msgid "Starting Date"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -294,13 +277,16 @@ msgid "Sign in / Sign out"
 msgstr ""
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -339,6 +325,11 @@ msgstr ""
 msgid "November"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -383,9 +374,12 @@ msgid "Action"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -407,12 +401,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -447,6 +435,14 @@ msgstr ""
 msgid "Employee"
 msgstr ""
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -481,6 +477,15 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -522,8 +527,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/id.po b/addons/hr_attendance/i18n/id.po
index d0749aa3257..0635bf60436 100644
--- a/addons/hr_attendance/i18n/id.po
+++ b/addons/hr_attendance/i18n/id.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-09 13:49+0000\n"
 "Last-Translator: <>\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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,11 +170,6 @@ msgstr ""
 msgid "Attendance"
 msgstr ""
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -220,11 +208,6 @@ msgstr ""
 msgid "Starting Date"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -294,13 +277,16 @@ msgid "Sign in / Sign out"
 msgstr ""
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -339,6 +325,11 @@ msgstr ""
 msgid "November"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -383,9 +374,12 @@ msgid "Action"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -407,12 +401,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -447,6 +435,14 @@ msgstr ""
 msgid "Employee"
 msgstr ""
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -481,6 +477,15 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -522,8 +527,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/it.po b/addons/hr_attendance/i18n/it.po
index dda406832a6..a58c51bd61f 100644
--- a/addons/hr_attendance/i18n/it.po
+++ b/addons/hr_attendance/i18n/it.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-03 07:47+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-11-04 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr "Gruppo Di..."
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome di modello non valido nella definizione dell'azione."
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr "Oggi"
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr "Ok"
 msgid "Define attendance reason"
 msgstr "Definisci Motivi Presenza"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,13 +170,6 @@ msgstr "Una entrata deve essere registrata appena dopo un'uscita"
 msgid "Attendance"
 msgstr "Presenze"
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-"Ora sei pronto per registrare ingressi e uscite nel sistema di gestione "
-"delle presenze"
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -224,11 +210,6 @@ msgstr "Report Errori Presenze"
 msgid "Starting Date"
 msgstr "Data di inizio"
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -298,13 +279,16 @@ msgid "Sign in / Sign out"
 msgstr "Entrate/Uscite"
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -343,6 +327,11 @@ msgstr "Data"
 msgid "November"
 msgstr "Novembre"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -387,9 +376,12 @@ msgid "Action"
 msgstr "Azione"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -411,14 +403,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Annulla"
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -455,6 +439,14 @@ msgstr "Ritardo"
 msgid "Employee"
 msgstr "Dipendente"
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -489,6 +481,15 @@ msgstr "Ultima Entrata"
 msgid "Sign Out"
 msgstr "Uscita"
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -530,8 +531,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr "Al di sotto di questo ritardo, l'errore è da considerarsi volontario"
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
@@ -557,6 +559,20 @@ msgstr ""
 #~ msgid "Print Attendance Report"
 #~ msgstr "Stampa Report Presenze"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per Visualizzazione Architettura!"
+
+#~ msgid "You are now ready to sign in or out of the attendance follow up"
+#~ msgstr ""
+#~ "Ora sei pronto per registrare ingressi e uscite nel sistema di gestione "
+#~ "delle presenze"
+
 #~ msgid "Employee's name"
 #~ msgstr "Nome Dipendente"
 
@@ -583,6 +599,9 @@ msgstr ""
 #~ msgid "This module aims to manage employee's attendances."
 #~ msgstr "Questo modulo mira a gestire le presenze dei dipendenti"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome di modello non valido nella definizione dell'azione."
+
 #~ msgid "Select a month"
 #~ msgstr "Selezionare un mese"
 
diff --git a/addons/hr_attendance/i18n/ko.po b/addons/hr_attendance/i18n/ko.po
index 1eef49c4243..d66e26849e0 100644
--- a/addons/hr_attendance/i18n/ko.po
+++ b/addons/hr_attendance/i18n/ko.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-08 16:36+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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -27,24 +27,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -120,6 +107,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr "참석 이유 저의"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -178,11 +171,6 @@ msgstr "Sign-In은 Sign-Out 다음에 이뤄질 수 있습니다 !"
 msgid "Attendance"
 msgstr "참석"
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr "이제 Follow-Up 중인 참석에 출석 또는 퇴장할 준비가 되었습니다."
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -221,11 +209,6 @@ msgstr "참석 에러 리포트"
 msgid "Starting Date"
 msgstr "시작 날짜"
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -295,13 +278,16 @@ msgid "Sign in / Sign out"
 msgstr ""
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -340,6 +326,11 @@ msgstr "나짜"
 msgid "November"
 msgstr "11월"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -384,9 +375,12 @@ msgid "Action"
 msgstr "액션"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -408,12 +402,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "취소"
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -448,6 +436,14 @@ msgstr "지연"
 msgid "Employee"
 msgstr "직원"
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -482,6 +478,15 @@ msgstr "귀하의 마지막 Sing-In"
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -523,8 +528,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
@@ -552,6 +558,9 @@ msgstr ""
 #~ "다른 이벤트보다 앞선 날짜로 서명하려 했습니다 !\n"
 #~ "참석을 교정하려면 관리자에게 문의하십시오."
 
+#~ msgid "You are now ready to sign in or out of the attendance follow up"
+#~ msgstr "이제 Follow-Up 중인 참석에 출석 또는 퇴장할 준비가 되었습니다."
+
 #~ msgid "Select a time span"
 #~ msgstr "기간 선택"
 
diff --git a/addons/hr_attendance/i18n/lt.po b/addons/hr_attendance/i18n/lt.po
index dbaeff43a08..e858532b5c5 100644
--- a/addons/hr_attendance/i18n/lt.po
+++ b/addons/hr_attendance/i18n/lt.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,11 +170,6 @@ msgstr ""
 msgid "Attendance"
 msgstr ""
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -220,11 +208,6 @@ msgstr ""
 msgid "Starting Date"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -294,13 +277,16 @@ msgid "Sign in / Sign out"
 msgstr ""
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -339,6 +325,11 @@ msgstr ""
 msgid "November"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -383,9 +374,12 @@ msgid "Action"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -407,12 +401,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -447,6 +435,14 @@ msgstr ""
 msgid "Employee"
 msgstr ""
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -481,6 +477,15 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -522,8 +527,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/lv.po b/addons/hr_attendance/i18n/lv.po
index 1dee94664aa..09d9a0f082c 100644
--- a/addons/hr_attendance/i18n/lv.po
+++ b/addons/hr_attendance/i18n/lv.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-10-22 14:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -27,24 +27,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -120,6 +107,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -178,11 +171,6 @@ msgstr ""
 msgid "Attendance"
 msgstr ""
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -221,11 +209,6 @@ msgstr ""
 msgid "Starting Date"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -295,13 +278,16 @@ msgid "Sign in / Sign out"
 msgstr ""
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -340,6 +326,11 @@ msgstr ""
 msgid "November"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -384,9 +375,12 @@ msgid "Action"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -408,12 +402,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -448,6 +436,14 @@ msgstr ""
 msgid "Employee"
 msgstr ""
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -482,6 +478,15 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -523,8 +528,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/mn.po b/addons/hr_attendance/i18n/mn.po
index f3de5c5d5cf..adc50bc538a 100644
--- a/addons/hr_attendance/i18n/mn.po
+++ b/addons/hr_attendance/i18n/mn.po
@@ -6,14 +6,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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-25 19:37+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-26 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,11 +26,6 @@ msgstr "Ирц, цагийн хяналт"
 msgid "Group By..."
 msgstr "Бүлэглэх..."
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
@@ -72,11 +67,9 @@ msgid "The sign-out date must be in the past"
 msgstr "Системээс гарсан огноо нь өнгөрсөн огноо байх ёстой"
 
 #. module: hr_attendance
-#: selection:hr.action.reason,action_type:0
-#: view:hr.sign.in.out:0
-#: view:hr.sign.in.out.ask:0
-msgid "Sign in"
-msgstr "Нэвтрэх"
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Signed"
+msgstr "Нэвтэрсэн огноо"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
@@ -115,6 +108,12 @@ msgstr "Тийм"
 msgid "Define attendance reason"
 msgstr "Ирцийн үйлдлийг тодорхойлох"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -178,22 +177,12 @@ msgstr "Ирц"
 msgid "Max. Delay (Min)"
 msgstr "Хамгийн их саатал (Хамгийн бага)"
 
-#. module: hr_attendance
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 #: view:hr.attendance.month:0
 msgid "Print"
 msgstr "Хэвлэх"
 
-#. module: hr_attendance
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Hr Attendance Search"
@@ -223,11 +212,6 @@ msgstr "Ирцийн алдаатай мэдээлэл"
 msgid "Starting Date"
 msgstr "Эхлэл Огноо"
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Харагдах архитектурт нийцэхгүй XML!"
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -312,11 +296,6 @@ msgstr ""
 msgid "hr.sign.out.ask"
 msgstr "Системээс гарах хүсэлт"
 
-#. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Алдаа! Рекурс цэсийг үүсгэж болохгүй."
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "August"
@@ -353,6 +332,11 @@ msgstr "Огноо"
 msgid "November"
 msgstr "11 сар"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -369,9 +353,11 @@ msgid "January"
 msgstr "1 сар"
 
 #. module: hr_attendance
-#: report:report.hr.timesheet.attendance.error:0
-msgid "Date Signed"
-msgstr "Нэвтэрсэн огноо"
+#: selection:hr.action.reason,action_type:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Sign in"
+msgstr "Нэвтрэх"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -403,12 +389,6 @@ msgid ""
 "encode their time with this action button."
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
-msgstr "Таны сонголтод таарах бичлэг олдсонгүй"
-
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
 msgid "Print Week Attendance Report"
@@ -420,11 +400,6 @@ msgstr "Долоо хоногийн ирцийн тайлан"
 msgid "Empoyee ID"
 msgstr "Ажилтны дугаар"
 
-#. module: hr_attendance
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 #: view:hr.attendance.month:0
@@ -433,19 +408,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Цуцлах"
 
-#. module: hr_attendance
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-"болохгүй!"
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -575,9 +537,10 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr "Саатал нь үүнээс бага бол, энэ алдааг анзаарахгүй гэж үзнэ"
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "osv_memory обьект дүрмийг дэмждэггүй"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
+msgstr "Таны сонголтод таарах бичлэг олдсонгүй"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -598,12 +561,21 @@ msgstr "Жил"
 msgid "hr.sign.in.out.ask"
 msgstr "Нэвтрэх, гарахыг хүсэх"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+#~ "болохгүй!"
+
 #~ msgid "You are now ready to sign in or out of the attendance follow up"
 #~ msgstr "Ирцийн зөв дарааллын дагуу нэврэх буюу гарахад бэлэн боллоо"
 
 #~ msgid "Employee's name"
 #~ msgstr "Ажилтны нэр"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Харагдах архитектурт нийцэхгүй XML!"
+
 #~ msgid "Print Timesheet"
 #~ msgstr "Хуваарь хэвлэх"
 
@@ -639,8 +611,17 @@ msgstr "Нэвтрэх, гарахыг хүсэх"
 #~ msgid "This module aims to manage employee's attendances."
 #~ msgstr "Модулийн зорилго нь ажилчдын ирцийг зохицуулах"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+
 #~ msgid ""
 #~ "You did not signed out the last time. Please enter the date and time you "
 #~ "signed out."
 #~ msgstr ""
 #~ "Та сүүлд гарсан бүртгэлээ хийгээгүй байна. Гарсан огноогоо оруулна уу."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Алдаа! Рекурс цэсийг үүсгэж болохгүй."
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "osv_memory обьект дүрмийг дэмждэггүй"
diff --git a/addons/hr_attendance/i18n/nl.po b/addons/hr_attendance/i18n/nl.po
index 1a5942eca16..2584a664f2c 100644
--- a/addons/hr_attendance/i18n/nl.po
+++ b/addons/hr_attendance/i18n/nl.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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-12-02 07:37+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-03 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,11 +26,6 @@ msgstr "Tijdregistratie"
 msgid "Group By..."
 msgstr "Groepeer op..."
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de actie-definitie."
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
@@ -72,11 +67,9 @@ msgid "The sign-out date must be in the past"
 msgstr "De uitklokdatum moet in het verleden liggen"
 
 #. module: hr_attendance
-#: selection:hr.action.reason,action_type:0
-#: view:hr.sign.in.out:0
-#: view:hr.sign.in.out.ask:0
-msgid "Sign in"
-msgstr "Inklokken"
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Signed"
+msgstr "Dagtekening"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
@@ -115,6 +108,12 @@ msgstr "Ok"
 msgid "Define attendance reason"
 msgstr "Aanwezigheidsreden definieren"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -178,22 +177,12 @@ msgstr "Aanwezigheid"
 msgid "Max. Delay (Min)"
 msgstr "Maximale vertraging (min)"
 
-#. module: hr_attendance
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "De modulenaam moet uniek zijn !"
-
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 #: view:hr.attendance.month:0
 msgid "Print"
 msgstr "Afdrukken"
 
-#. module: hr_attendance
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Hr Attendance Search"
@@ -222,11 +211,6 @@ msgstr "Overzicht aanwezigheidsfoutmeldingen"
 msgid "Starting Date"
 msgstr "Startdatum"
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -314,11 +298,6 @@ msgstr ""
 msgid "hr.sign.out.ask"
 msgstr "hr.sign.out.ask"
 
-#. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fout ! U kunt geen recursief menu maken."
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "August"
@@ -355,6 +334,11 @@ msgstr "Datum"
 msgid "November"
 msgstr "November"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -371,9 +355,11 @@ msgid "January"
 msgstr "Januari"
 
 #. module: hr_attendance
-#: report:report.hr.timesheet.attendance.error:0
-msgid "Date Signed"
-msgstr "Dagtekening"
+#: selection:hr.action.reason,action_type:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Sign in"
+msgstr "Inklokken"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -409,12 +395,6 @@ msgstr ""
 "medewerker is gekoppeld aan een systeem gebruiker, kunnen ze hun tijd "
 "invoeren met deze actieknop."
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
-msgstr "Geen gegevens gevonden voor uw selectie !"
-
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
 msgid "Print Week Attendance Report"
@@ -426,11 +406,6 @@ msgstr "Afdrukken weekaanwezigheid overzicht"
 msgid "Empoyee ID"
 msgstr "Medewerker ID"
 
-#. module: hr_attendance
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "Regel moet tenminste één toegangsrecht aangevinkt hebben !"
-
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 #: view:hr.attendance.month:0
@@ -439,18 +414,6 @@ msgstr "Regel moet tenminste één toegangsrecht aangevinkt hebben !"
 msgid "Cancel"
 msgstr "Annuleren"
 
-#. module: hr_attendance
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#. module: hr_attendance
-#: 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 karakters bevatten !"
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -586,9 +549,10 @@ msgstr ""
 "Onder deze vertraging wordt de fout verondersteld vrijwillig te zijn."
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Regels worden niet ondersteund voor osv_memory objecten !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
+msgstr "Geen gegevens gevonden voor uw selectie !"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -609,6 +573,11 @@ msgstr "Jaar"
 msgid "hr.sign.in.out.ask"
 msgstr "hr.sign.in.out.ask"
 
+#~ 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 karakters bevatten !"
+
 #~ msgid "Action reason"
 #~ msgstr "Actiereden"
 
@@ -621,9 +590,15 @@ msgstr "hr.sign.in.out.ask"
 #~ msgid "You are now ready to sign in or out of the attendance follow up"
 #~ msgstr "U bent nu klaar om in- of uit te klokken"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML voor weergave!"
+
 #~ msgid "Select a time span"
 #~ msgstr "Kies een tijdspanne"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ongeldige modelnaam in de actie-definitie."
+
 #~ msgid "Print Timesheet by week"
 #~ msgstr "Druk urenstaat per week af"
 
@@ -658,3 +633,21 @@ msgstr "hr.sign.in.out.ask"
 
 #~ msgid "Select a month"
 #~ msgstr "Kies een maand"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fout ! U kunt geen recursief menu maken."
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Regels worden niet ondersteund voor osv_memory objecten !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "De modulenaam moet uniek zijn !"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "Regel moet tenminste één toegangsrecht aangevinkt hebben !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/hr_attendance/i18n/nl_BE.po b/addons/hr_attendance/i18n/nl_BE.po
index 7d3d5ce5a1f..5509e1a962e 100644
--- a/addons/hr_attendance/i18n/nl_BE.po
+++ b/addons/hr_attendance/i18n/nl_BE.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-04-10 10:15+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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,11 +170,6 @@ msgstr ""
 msgid "Attendance"
 msgstr ""
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -220,11 +208,6 @@ msgstr ""
 msgid "Starting Date"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -294,13 +277,16 @@ msgid "Sign in / Sign out"
 msgstr ""
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -339,6 +325,11 @@ msgstr ""
 msgid "November"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -383,9 +374,12 @@ msgid "Action"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -407,13 +401,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_attendance
-#: 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 karakters bevatten !"
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -448,6 +435,14 @@ msgstr ""
 msgid "Employee"
 msgstr ""
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -482,6 +477,15 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -523,8 +527,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
@@ -543,3 +548,8 @@ msgstr ""
 #: view:hr.sign.in.out.ask:0
 msgid "hr.sign.in.out.ask"
 msgstr ""
+
+#~ 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 karakters bevatten !"
diff --git a/addons/hr_attendance/i18n/pl.po b/addons/hr_attendance/i18n/pl.po
index b70092647fa..11b430d7431 100644
--- a/addons/hr_attendance/i18n/pl.po
+++ b/addons/hr_attendance/i18n/pl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 05:31+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr "Definiuj powody obecności"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,11 +170,6 @@ msgstr ""
 msgid "Attendance"
 msgstr "Obecności"
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr "Możesz teraz rejestrować wejścia i wyjścia do kontroli obecności"
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -222,11 +210,6 @@ msgstr "Raport błędów obecności"
 msgid "Starting Date"
 msgstr "Data rozpoczęcia"
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -296,13 +279,16 @@ msgid "Sign in / Sign out"
 msgstr "Wejście / Wyjście"
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -341,6 +327,11 @@ msgstr "Data"
 msgid "November"
 msgstr "Listopad"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -385,9 +376,12 @@ msgid "Action"
 msgstr "Akcja"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -409,14 +403,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Anuluj"
 
-#. module: hr_attendance
-#: 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: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -453,6 +439,14 @@ msgstr "Opóźnienie"
 msgid "Employee"
 msgstr "Pracownik"
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -487,6 +481,15 @@ msgstr "Twoje ostatnie wejście"
 msgid "Sign Out"
 msgstr "Wyjście"
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -528,8 +531,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr "Opóźnienie poniżej tej wartości jest traktowane jako dozwolone."
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
@@ -549,6 +553,15 @@ msgstr "Rok"
 msgid "hr.sign.in.out.ask"
 msgstr ""
 
+#~ 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 "Employee's name"
 #~ msgstr "Nazwisko pracownika"
 
@@ -579,9 +592,15 @@ msgstr ""
 #~ msgid "Select a time span"
 #~ msgstr "Wybierz odstęp czasu"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
 #~ msgid "This module aims to manage employee's attendances."
 #~ msgstr "Ten moduł służy do kontroli obecności"
 
+#~ msgid "You are now ready to sign in or out of the attendance follow up"
+#~ msgstr "Możesz teraz rejestrować wejścia i wyjścia do kontroli obecności"
+
 #~ msgid ""
 #~ "You did not signed out the last time. Please enter the date and time you "
 #~ "signed out."
diff --git a/addons/hr_attendance/i18n/pt.po b/addons/hr_attendance/i18n/pt.po
index 26432678703..88cd948cdaf 100644
--- a/addons/hr_attendance/i18n/pt.po
+++ b/addons/hr_attendance/i18n/pt.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:12+0000\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"
 "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-11-28 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,11 +26,6 @@ msgstr "Registo de Tempo"
 msgid "Group By..."
 msgstr "Agrupar Por..."
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de módulo inválido na definição da acção"
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
@@ -72,11 +67,9 @@ msgid "The sign-out date must be in the past"
 msgstr "A data de saída tem de ser passada"
 
 #. module: hr_attendance
-#: selection:hr.action.reason,action_type:0
-#: view:hr.sign.in.out:0
-#: view:hr.sign.in.out.ask:0
-msgid "Sign in"
-msgstr "Entrada"
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Signed"
+msgstr "Data de Assinatura"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
@@ -115,6 +108,12 @@ msgstr "Ok"
 msgid "Define attendance reason"
 msgstr "Definir tipo de entradas e saídas"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -178,22 +177,12 @@ msgstr "Presenças"
 msgid "Max. Delay (Min)"
 msgstr "Máx. Atraso (Min)"
 
-#. module: hr_attendance
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo deve ser único!"
-
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 #: view:hr.attendance.month:0
 msgid "Print"
 msgstr "Imprimir"
 
-#. module: hr_attendance
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "O ID do certificado do módulo tem de ser único!"
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Hr Attendance Search"
@@ -221,11 +210,6 @@ msgstr "Relatório de Desvios de Pontualidade"
 msgid "Starting Date"
 msgstr "Data Inicial"
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML Inválido para a Arquitectura de Vista !"
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -309,11 +293,6 @@ msgstr ""
 msgid "hr.sign.out.ask"
 msgstr "hr.sign.out.ask"
 
-#. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Erro ! Não pode criar menus recursivos"
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "August"
@@ -350,6 +329,11 @@ msgstr "Data"
 msgid "November"
 msgstr "Novembro"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -366,9 +350,11 @@ msgid "January"
 msgstr "Janeiro"
 
 #. module: hr_attendance
-#: report:report.hr.timesheet.attendance.error:0
-msgid "Date Signed"
-msgstr "Data de Assinatura"
+#: selection:hr.action.reason,action_type:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Sign in"
+msgstr "Entrada"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -400,12 +386,6 @@ msgid ""
 "encode their time with this action button."
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
-msgstr "Não foram encontrados registos para a sua selecção!"
-
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
 msgid "Print Week Attendance Report"
@@ -417,11 +397,6 @@ msgstr "Imprimir Relatório Semanal de Pontualidade"
 msgid "Empoyee ID"
 msgstr "ID do Empregado"
 
-#. module: hr_attendance
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 #: view:hr.attendance.month:0
@@ -430,19 +405,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: hr_attendance
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do Objecto deve começar com x_ e não pode conter nenhum carácter "
-"especial!"
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -573,9 +535,10 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr "Abaixo deste atraso, o erro é considerado como sendo voluntário"
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "O objecto osv_memory não suporta regras!"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
+msgstr "Não foram encontrados registos para a sua selecção!"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -599,5 +562,32 @@ msgstr "hr.sign.in.out.ask"
 #~ msgid "Action reason"
 #~ msgstr "Motivo da acção"
 
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Erro ! Não pode criar menus recursivos"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "O objecto osv_memory não suporta regras!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de módulo inválido na definição da acção"
+
 #~ msgid "You are now ready to sign in or out of the attendance follow up"
 #~ msgstr "Você já pode registar entradas ou saídas do registo de presenças"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum carácter "
+#~ "especial!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML Inválido para a Arquitectura de Vista !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID do certificado do módulo tem de ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "O nome do módulo deve ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
diff --git a/addons/hr_attendance/i18n/pt_BR.po b/addons/hr_attendance/i18n/pt_BR.po
index e36fdda2956..2c9b25174b3 100644
--- a/addons/hr_attendance/i18n/pt_BR.po
+++ b/addons/hr_attendance/i18n/pt_BR.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 10:46+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-10-31 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,11 +170,6 @@ msgstr ""
 msgid "Attendance"
 msgstr ""
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -220,11 +208,6 @@ msgstr ""
 msgid "Starting Date"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -294,13 +277,16 @@ msgid "Sign in / Sign out"
 msgstr ""
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -339,6 +325,11 @@ msgstr ""
 msgid "November"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -383,9 +374,12 @@ msgid "Action"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -407,14 +401,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-"especial!"
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -451,6 +437,14 @@ msgstr ""
 msgid "Employee"
 msgstr ""
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -485,6 +479,15 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -526,8 +529,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr "Indique este atraso, o erro é considerado para ser voluntário"
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
@@ -546,3 +550,12 @@ msgstr ""
 #: view:hr.sign.in.out.ask:0
 msgid "hr.sign.in.out.ask"
 msgstr ""
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
+#~ "especial!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalido XML para Arquitetura da View"
diff --git a/addons/hr_attendance/i18n/ro.po b/addons/hr_attendance/i18n/ro.po
index 52d7671b740..078704fe10d 100644
--- a/addons/hr_attendance/i18n/ro.po
+++ b/addons/hr_attendance/i18n/ro.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-08 12:16+0000\n"
 "Last-Translator: filsys <office@filsystem.ro>\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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,11 +170,6 @@ msgstr ""
 msgid "Attendance"
 msgstr ""
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -220,11 +208,6 @@ msgstr ""
 msgid "Starting Date"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -294,13 +277,16 @@ msgid "Sign in / Sign out"
 msgstr ""
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -339,6 +325,11 @@ msgstr ""
 msgid "November"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -383,9 +374,12 @@ msgid "Action"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -407,12 +401,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -447,6 +435,14 @@ msgstr ""
 msgid "Employee"
 msgstr ""
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -481,6 +477,15 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -522,8 +527,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/ru.po b/addons/hr_attendance/i18n/ru.po
index b3add544918..72b558bdc5e 100644
--- a/addons/hr_attendance/i18n/ru.po
+++ b/addons/hr_attendance/i18n/ru.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 05:36+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,11 +170,6 @@ msgstr ""
 msgid "Attendance"
 msgstr "Посещаемость"
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -220,11 +208,6 @@ msgstr ""
 msgid "Starting Date"
 msgstr "Дата начала"
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -294,13 +277,16 @@ msgid "Sign in / Sign out"
 msgstr "Регистрация / выход"
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -339,6 +325,11 @@ msgstr "Дата"
 msgid "November"
 msgstr "Ноябрь"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -383,9 +374,12 @@ msgid "Action"
 msgstr "Действие"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -407,14 +401,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Отмена"
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -449,6 +435,14 @@ msgstr "Задержка"
 msgid "Employee"
 msgstr "Сотрудник"
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -483,6 +477,15 @@ msgstr "Ваш послежний вход"
 msgid "Sign Out"
 msgstr "Выйти"
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -524,8 +527,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
@@ -545,6 +549,15 @@ msgstr "Год"
 msgid "hr.sign.in.out.ask"
 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 "Employee's name"
 #~ msgstr "Имя сотрудника"
 
@@ -563,5 +576,8 @@ msgstr ""
 #~ "Вы не зарегистрировались в прошлый раз. Укажите дату и время вашей "
 #~ "регистрации."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Недопустимое имя модели в определении действия."
+
 #~ msgid "Select a month"
 #~ msgstr "Выбрать месяц"
diff --git a/addons/hr_attendance/i18n/sl.po b/addons/hr_attendance/i18n/sl.po
index 062495f4ced..be0c8e4cb1b 100644
--- a/addons/hr_attendance/i18n/sl.po
+++ b/addons/hr_attendance/i18n/sl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 05:36+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Napačno ime modela v definiciji dejanja."
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,11 +170,6 @@ msgstr ""
 msgid "Attendance"
 msgstr "Prisotnost"
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -220,11 +208,6 @@ msgstr ""
 msgid "Starting Date"
 msgstr "Začetni datum"
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -294,13 +277,16 @@ msgid "Sign in / Sign out"
 msgstr "Prijava/Odjava"
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -339,6 +325,11 @@ msgstr "Datum"
 msgid "November"
 msgstr "november"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -383,9 +374,12 @@ msgid "Action"
 msgstr "Dejanje"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -407,13 +401,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Prekliči"
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -448,6 +435,14 @@ msgstr "Zakasnitev"
 msgid "Employee"
 msgstr "Zaposleni"
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -482,6 +477,15 @@ msgstr "Zadnja prijava"
 msgid "Sign Out"
 msgstr "Odjavi"
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -523,8 +527,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
@@ -547,9 +552,20 @@ msgstr ""
 #~ msgid "Select a time span"
 #~ msgstr "Izberite časovni razpon"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda."
+
 #~ msgid "Employee's name"
 #~ msgstr "Ime zaposlenega"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Napačno ime modela v definiciji dejanja."
+
 #~ msgid "Print Timesheet"
 #~ msgstr "Izpiši časovnico"
 
diff --git a/addons/hr_attendance/i18n/sq.po b/addons/hr_attendance/i18n/sq.po
index 02f1203b343..705ba4ef2f2 100644
--- a/addons/hr_attendance/i18n/sq.po
+++ b/addons/hr_attendance/i18n/sq.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -27,24 +27,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -120,6 +107,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -178,11 +171,6 @@ msgstr ""
 msgid "Attendance"
 msgstr ""
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -221,11 +209,6 @@ msgstr ""
 msgid "Starting Date"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -295,13 +278,16 @@ msgid "Sign in / Sign out"
 msgstr ""
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -340,6 +326,11 @@ msgstr ""
 msgid "November"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -384,9 +375,12 @@ msgid "Action"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -408,12 +402,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -448,6 +436,14 @@ msgstr ""
 msgid "Employee"
 msgstr ""
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -482,6 +478,15 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -523,8 +528,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/sr@latin.po b/addons/hr_attendance/i18n/sr@latin.po
index dbafd2a70e4..59af87df3ee 100644
--- a/addons/hr_attendance/i18n/sr@latin.po
+++ b/addons/hr_attendance/i18n/sr@latin.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/sv.po b/addons/hr_attendance/i18n/sv.po
index 0c818fb668a..2a0b14ae498 100644
--- a/addons/hr_attendance/i18n/sv.po
+++ b/addons/hr_attendance/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-24 09:08+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-11-25 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,11 +26,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Invalid model name in the action definition."
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
@@ -72,11 +67,9 @@ msgid "The sign-out date must be in the past"
 msgstr "The sign-out date must be in the past"
 
 #. module: hr_attendance
-#: selection:hr.action.reason,action_type:0
-#: view:hr.sign.in.out:0
-#: view:hr.sign.in.out.ask:0
-msgid "Sign in"
-msgstr "Sign in"
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Signed"
+msgstr "Date Signed"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
@@ -115,6 +108,12 @@ msgstr "Ok"
 msgid "Define attendance reason"
 msgstr "Define attendance reason"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -178,22 +177,12 @@ msgstr "Attendance"
 msgid "Max. Delay (Min)"
 msgstr "Max. Delay (Min)"
 
-#. module: hr_attendance
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 #: view:hr.attendance.month:0
 msgid "Print"
 msgstr ""
 
-#. module: hr_attendance
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Hr Attendance Search"
@@ -222,11 +211,6 @@ msgstr "Attendance Error Report"
 msgid "Starting Date"
 msgstr "Starting Date"
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -308,11 +292,6 @@ msgstr ""
 msgid "hr.sign.out.ask"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "August"
@@ -349,6 +328,11 @@ msgstr "Datum"
 msgid "November"
 msgstr "November"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -365,9 +349,11 @@ msgid "January"
 msgstr "January"
 
 #. module: hr_attendance
-#: report:report.hr.timesheet.attendance.error:0
-msgid "Date Signed"
-msgstr "Date Signed"
+#: selection:hr.action.reason,action_type:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Sign in"
+msgstr "Sign in"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -399,12 +385,6 @@ msgid ""
 "encode their time with this action button."
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
-msgstr "No records found for your selection!"
-
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
 msgid "Print Week Attendance Report"
@@ -416,11 +396,6 @@ msgstr ""
 msgid "Empoyee ID"
 msgstr ""
 
-#. module: hr_attendance
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 #: view:hr.attendance.month:0
@@ -429,18 +404,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancel"
 
-#. module: hr_attendance
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -568,9 +531,10 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr "Bellow this delay, the error is considered to be voluntary"
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
+msgstr "No records found for your selection!"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -591,6 +555,11 @@ msgstr "Year"
 msgid "hr.sign.in.out.ask"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
 #, python-format
 #~ msgid ""
 #~ "You tried to sign with a date anterior to another event !\n"
@@ -599,6 +568,9 @@ msgstr ""
 #~ "You tried to sign with a date anterior to another event !\n"
 #~ "Try to contact the administrator to correct attendances."
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalid XML for View Architecture!"
+
 #~ msgid "You are now ready to sign in or out of the attendance follow up"
 #~ msgstr "You are now ready to sign in or out of the attendance follow up"
 
@@ -611,6 +583,9 @@ msgstr ""
 #~ msgid "Print Attendance Error Report"
 #~ msgstr "Print Attendance Error Report"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Invalid model name in the action definition."
+
 #~ msgid "Print Timesheet by week"
 #~ msgstr "Print Timesheet by week"
 
diff --git a/addons/hr_attendance/i18n/tlh.po b/addons/hr_attendance/i18n/tlh.po
index 07661225510..a56cc2329ff 100644
--- a/addons/hr_attendance/i18n/tlh.po
+++ b/addons/hr_attendance/i18n/tlh.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,11 +170,6 @@ msgstr ""
 msgid "Attendance"
 msgstr ""
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -220,11 +208,6 @@ msgstr ""
 msgid "Starting Date"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -294,13 +277,16 @@ msgid "Sign in / Sign out"
 msgstr ""
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -339,6 +325,11 @@ msgstr ""
 msgid "November"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -383,9 +374,12 @@ msgid "Action"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -407,12 +401,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -447,6 +435,14 @@ msgstr ""
 msgid "Employee"
 msgstr ""
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -481,6 +477,15 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -522,8 +527,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/tr.po b/addons/hr_attendance/i18n/tr.po
index 0446605c267..13271fd9be5 100644
--- a/addons/hr_attendance/i18n/tr.po
+++ b/addons/hr_attendance/i18n/tr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-09 07:20+0000\n"
 "Last-Translator: Angel Spy <melissadilara@yahoo.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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,11 +170,6 @@ msgstr ""
 msgid "Attendance"
 msgstr "Devam Süresi"
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -220,11 +208,6 @@ msgstr "Devam Süresi Hata Raporu"
 msgid "Starting Date"
 msgstr "Başlangıç Tarihi"
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -294,13 +277,16 @@ msgid "Sign in / Sign out"
 msgstr "Giriş / Çıkış"
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -339,6 +325,11 @@ msgstr "Tarih"
 msgid "November"
 msgstr "Kasım"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -383,9 +374,12 @@ msgid "Action"
 msgstr "Eylem"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -407,12 +401,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "İptal"
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -447,6 +435,14 @@ msgstr "Gecikme"
 msgid "Employee"
 msgstr "Personel"
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -481,6 +477,15 @@ msgstr "Son Girişiniz"
 msgid "Sign Out"
 msgstr "Çıkış"
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -522,8 +527,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
@@ -543,6 +549,9 @@ msgstr "Yıl"
 msgid "hr.sign.in.out.ask"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
+
 #~ msgid "Employee's name"
 #~ msgstr "Personelin Adı"
 
diff --git a/addons/hr_attendance/i18n/uk.po b/addons/hr_attendance/i18n/uk.po
index a2d7dd4fcd6..2ae2896f516 100644
--- a/addons/hr_attendance/i18n/uk.po
+++ b/addons/hr_attendance/i18n/uk.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-04 06:32+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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,11 +170,6 @@ msgstr ""
 msgid "Attendance"
 msgstr ""
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -220,11 +208,6 @@ msgstr ""
 msgid "Starting Date"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури Вигляду!"
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -294,13 +277,16 @@ msgid "Sign in / Sign out"
 msgstr ""
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -339,6 +325,11 @@ msgstr ""
 msgid "November"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -383,9 +374,12 @@ msgid "Action"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -407,13 +401,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -448,6 +435,14 @@ msgstr ""
 msgid "Employee"
 msgstr "Співробітник"
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -482,6 +477,15 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -523,8 +527,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
@@ -543,3 +548,11 @@ msgstr ""
 #: view:hr.sign.in.out.ask:0
 msgid "hr.sign.in.out.ask"
 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 для Архітектури Вигляду!"
diff --git a/addons/hr_attendance/i18n/vi.po b/addons/hr_attendance/i18n/vi.po
index fa2de0bae26..477d702626b 100644
--- a/addons/hr_attendance/i18n/vi.po
+++ b/addons/hr_attendance/i18n/vi.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -27,24 +27,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -120,6 +107,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -178,11 +171,6 @@ msgstr ""
 msgid "Attendance"
 msgstr ""
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -221,11 +209,6 @@ msgstr ""
 msgid "Starting Date"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -295,13 +278,16 @@ msgid "Sign in / Sign out"
 msgstr ""
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -340,6 +326,11 @@ msgstr ""
 msgid "November"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -384,9 +375,12 @@ msgid "Action"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -408,12 +402,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -448,6 +436,14 @@ msgstr ""
 msgid "Employee"
 msgstr ""
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -482,6 +478,15 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -523,8 +528,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/zh_CN.po b/addons/hr_attendance/i18n/zh_CN.po
index cf0112afc3a..d6c71dccbda 100644
--- a/addons/hr_attendance/i18n/zh_CN.po
+++ b/addons/hr_attendance/i18n/zh_CN.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-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/zh_TW.po b/addons/hr_attendance/i18n/zh_TW.po
index bb7de871360..171fae4483a 100644
--- a/addons/hr_attendance/i18n/zh_TW.po
+++ b/addons/hr_attendance/i18n/zh_TW.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-01-23 17:55+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-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr "定义出勤理由"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -177,11 +170,6 @@ msgstr ""
 msgid "Attendance"
 msgstr ""
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr ""
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -220,11 +208,6 @@ msgstr ""
 msgid "Starting Date"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -294,13 +277,16 @@ msgid "Sign in / Sign out"
 msgstr ""
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -339,6 +325,11 @@ msgstr "日期"
 msgid "November"
 msgstr ""
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -383,9 +374,12 @@ msgid "Action"
 msgstr "动作"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -407,12 +401,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -447,6 +435,14 @@ msgstr ""
 msgid "Employee"
 msgstr ""
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -481,6 +477,15 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -522,8 +527,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
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/ar.po b/addons/hr_contract/i18n/ar.po
index 97cf32ba39d..c7948ff6fbd 100644
--- a/addons/hr_contract/i18n/ar.po
+++ b/addons/hr_contract/i18n/ar.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 05:39+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,19 +32,13 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
+msgid "Function Arguments"
 msgstr ""
 
 #. module: hr_contract
@@ -58,8 +52,8 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
 msgstr ""
 
 #. module: hr_contract
@@ -73,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -88,8 +82,8 @@ msgid "Wage Types"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -105,13 +99,14 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
 msgstr ""
 
 #. module: hr_contract
@@ -130,13 +125,14 @@ msgid "Function"
 msgstr "الدالة"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
+#: view:hr.employee:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_contract
@@ -159,12 +155,6 @@ msgstr ""
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -232,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -242,8 +232,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:hr.contract,wage:0
+msgid "Wage"
 msgstr ""
 
 #. module: hr_contract
@@ -263,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -348,9 +344,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -359,13 +354,8 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/bg.po b/addons/hr_contract/i18n/bg.po
index 5c838f1425f..86d1123d148 100644
--- a/addons/hr_contract/i18n/bg.po
+++ b/addons/hr_contract/i18n/bg.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 12:27+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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,21 +32,13 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
-"Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-"символи!"
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
+msgid "Function Arguments"
 msgstr ""
 
 #. module: hr_contract
@@ -60,8 +52,8 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
 msgstr ""
 
 #. module: hr_contract
@@ -75,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -90,8 +82,8 @@ msgid "Wage Types"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -107,13 +99,14 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
 msgstr ""
 
 #. module: hr_contract
@@ -132,13 +125,14 @@ msgid "Function"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
+#: view:hr.employee:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_contract
@@ -161,12 +155,6 @@ msgstr ""
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -234,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -244,9 +232,9 @@ msgid "End Date"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -265,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -350,9 +344,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -361,13 +354,8 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_contract
@@ -423,3 +411,12 @@ msgstr ""
 #: view:hr.contract.type:0
 msgid "Search Contract Type"
 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 за преглед на архитектурата"
diff --git a/addons/hr_contract/i18n/bs.po b/addons/hr_contract/i18n/bs.po
index f5faa92e272..ef6f5d2fb5e 100644
--- a/addons/hr_contract/i18n/bs.po
+++ b/addons/hr_contract/i18n/bs.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 12:27+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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,19 +32,13 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
+msgid "Function Arguments"
 msgstr ""
 
 #. module: hr_contract
@@ -58,8 +52,8 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
 msgstr ""
 
 #. module: hr_contract
@@ -73,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -88,8 +82,8 @@ msgid "Wage Types"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -105,13 +99,14 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
 msgstr ""
 
 #. module: hr_contract
@@ -130,13 +125,14 @@ msgid "Function"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
+#: view:hr.employee:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_contract
@@ -159,12 +155,6 @@ msgstr ""
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -232,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -242,9 +232,9 @@ msgid "End Date"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -263,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -348,9 +344,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -359,13 +354,8 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_contract
@@ -421,3 +411,6 @@ msgstr ""
 #: view:hr.contract.type:0
 msgid "Search Contract Type"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
diff --git a/addons/hr_contract/i18n/ca.po b/addons/hr_contract/i18n/ca.po
index 2a147f7da00..29132316afc 100644
--- a/addons/hr_contract/i18n/ca.po
+++ b/addons/hr_contract/i18n/ca.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 05:40+0000\n"
 "Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,23 +32,15 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
-"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-"especial!"
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
+msgid "Function Arguments"
 msgstr ""
 
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
-msgstr "Net"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
@@ -60,9 +52,9 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
-msgstr ""
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "Nom tipus de salari"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -75,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
-msgstr "Factor pel cost d'hora"
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -90,8 +82,8 @@ msgid "Wage Types"
 msgstr "Tipus de salari"
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -107,14 +99,15 @@ msgid "Employee"
 msgstr "Empleat"
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de model no vàlid en la definició de l'acció."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "Net"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -132,14 +125,15 @@ msgid "Function"
 msgstr "Funció"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
-msgstr "Salari"
+#: view:hr.employee:0
+msgid "Description"
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -161,12 +155,6 @@ msgstr "Contractes"
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -234,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -244,9 +232,9 @@ msgid "End Date"
 msgstr "Data final"
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Salari"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -265,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr "Notes"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -350,10 +344,9 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
-msgstr ""
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
+msgstr "Factor pel cost d'hora"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -361,15 +354,10 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
-msgstr "Nom tipus de salari"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Employee specific allowances and deductions"
@@ -426,6 +414,12 @@ msgstr ""
 msgid "Search Contract Type"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+#~ "especial!"
+
 #~ msgid "Generalities"
 #~ msgstr "Generalitats"
 
@@ -450,6 +444,9 @@ msgstr ""
 #~ msgid "Salary"
 #~ msgstr "Salari"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invàlid per a la definició de la vista!"
+
 #~ msgid "Remuneration"
 #~ msgstr "Remuneració"
 
@@ -468,5 +465,8 @@ msgstr ""
 #~ msgid "Contract Duration"
 #~ msgstr "Duració del contracte"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom de model no vàlid en la definició de l'acció."
+
 #~ msgid "AUDIENS Number"
 #~ msgstr "Número d'AUDIENS"
diff --git a/addons/hr_contract/i18n/cs.po b/addons/hr_contract/i18n/cs.po
index bb746e46c56..116d2112bf5 100644
--- a/addons/hr_contract/i18n/cs.po
+++ b/addons/hr_contract/i18n/cs.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,19 +32,13 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
+msgid "Function Arguments"
 msgstr ""
 
 #. module: hr_contract
@@ -58,8 +52,8 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
 msgstr ""
 
 #. module: hr_contract
@@ -73,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -88,8 +82,8 @@ msgid "Wage Types"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -105,13 +99,14 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
 msgstr ""
 
 #. module: hr_contract
@@ -130,13 +125,14 @@ msgid "Function"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
+#: view:hr.employee:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_contract
@@ -159,12 +155,6 @@ msgstr ""
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -232,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -242,8 +232,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:hr.contract,wage:0
+msgid "Wage"
 msgstr ""
 
 #. module: hr_contract
@@ -263,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -348,9 +344,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -359,13 +354,8 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/de.po b/addons/hr_contract/i18n/de.po
index 9026ae73eca..3595c8f0969 100644
--- a/addons/hr_contract/i18n/de.po
+++ b/addons/hr_contract/i18n/de.po
@@ -6,7 +6,7 @@ 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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-30 17:30+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -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-01 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -33,22 +33,14 @@ msgid "Trial Period"
 msgstr "Probezeit"
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
+msgstr "Probezeit Anfang"
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr "Kalkulation"
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
-msgstr "Netto"
+msgid "Function Arguments"
+msgstr "Funktion Argumente"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -61,14 +53,9 @@ msgid "Company Vehicle"
 msgstr "Firmenwagen"
 
 #. module: hr_contract
-#: 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 !"
-
-#. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
-msgstr "Abteilung"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "Vergütungstyp"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -81,14 +68,14 @@ msgid "Current"
 msgstr "Aktuell"
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
-msgstr "Stundensatz"
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr "Abteilung"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
-msgstr "Funktion Argumente"
+#: view:hr.contract:0
+msgid "Overpassed"
+msgstr "Abgelaufen"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -96,9 +83,9 @@ msgid "Wage Types"
 msgstr "Vergütungstyp"
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+#: view:hr.employee:0
+msgid "Calculations"
+msgstr "Kalkulation"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
@@ -113,14 +100,15 @@ msgid "Employee"
 msgstr "Angestellter"
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
-msgstr "Probezeit Anfang"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
+msgstr "Arbeitszeiten"
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "Netto"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -137,16 +125,17 @@ msgstr "Stundenzahl in Periode"
 msgid "Function"
 msgstr "Funktion"
 
+#. module: hr_contract
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
+msgstr "Gruppierung..."
+
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Description"
 msgstr "Beschreibung"
 
-#. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
-msgstr "Vergütung"
-
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
 msgid "Place of Birth"
@@ -167,12 +156,6 @@ msgstr "Arbeitsverträge"
 msgid "Is a Manager"
 msgstr "Abteilungsleiter?"
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr "Arbeitszeiten"
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -240,9 +223,9 @@ msgid "Search Wage Type"
 msgstr "Suche Vergütungsarten"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
-msgstr "Abrechnungsposition"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
@@ -250,9 +233,9 @@ msgid "End Date"
 msgstr "bis Datum"
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Vergütung"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -271,6 +254,12 @@ msgstr "in Kilometer"
 msgid "Notes"
 msgstr "Bemerkungen"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -356,15 +345,9 @@ msgid "Trial End Date"
 msgstr "Probezeit Ende"
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
-msgstr "Gruppierung..."
-
-#. module: hr_contract
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
+msgstr "Stundensatz"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -372,14 +355,9 @@ msgid "Period"
 msgstr "Periode"
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr "Abgelaufen"
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
-msgstr "Vergütungstyp"
+#: view:hr.employee:0
+msgid "Payslip Line"
+msgstr "Abrechnungsposition"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -432,11 +410,6 @@ msgstr "Zulagen"
 msgid "Main Data"
 msgstr "Basisdaten"
 
-#. module: hr_contract
-#: 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 !"
-
 #. module: hr_contract
 #: view:hr.contract.type:0
 msgid "Search Contract Type"
@@ -445,6 +418,12 @@ msgstr "Suche Vertragstyp"
 #~ msgid "AUDIENS Number"
 #~ msgstr "Mitarbeiternummer"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "Generalities"
 #~ msgstr "Allgemeines"
 
@@ -469,6 +448,9 @@ msgstr "Suche Vertragstyp"
 #~ msgid "Salary"
 #~ msgstr "Einkommen"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "Remuneration"
 #~ msgstr "Entlohung"
 
@@ -486,3 +468,18 @@ msgstr "Suche Vertragstyp"
 
 #~ msgid "Contract Duration"
 #~ msgstr "Vertragslaufzeit"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ 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 !"
diff --git a/addons/hr_contract/i18n/el.po b/addons/hr_contract/i18n/el.po
index 40477c9c85a..f8086f81570 100644
--- a/addons/hr_contract/i18n/el.po
+++ b/addons/hr_contract/i18n/el.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 05:41+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -35,22 +35,15 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
-"Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες"
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
+msgid "Function Arguments"
 msgstr ""
 
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
-msgstr "Καθαρό"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
@@ -62,9 +55,9 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
-msgstr ""
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "Όνομα Τύπου Αποδοχών"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -77,13 +70,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
-msgstr "Παράγοντας ωριαίου κόστους"
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -92,8 +85,8 @@ msgid "Wage Types"
 msgstr "Τύποι Αποδοχών"
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -109,14 +102,15 @@ msgid "Employee"
 msgstr "Υπάλληλος"
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "Καθαρό"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -134,14 +128,15 @@ msgid "Function"
 msgstr "Λειτουργία"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
-msgstr "Μισθός"
+#: view:hr.employee:0
+msgid "Description"
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -163,12 +158,6 @@ msgstr "Συμβάσεις"
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -236,8 +225,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -246,9 +235,9 @@ msgid "End Date"
 msgstr "Λήξη"
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Μισθός"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -267,6 +256,12 @@ msgstr ""
 msgid "Notes"
 msgstr "Σημειώσεις"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -352,10 +347,9 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
-msgstr ""
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
+msgstr "Παράγοντας ωριαίου κόστους"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -363,15 +357,10 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
-msgstr "Όνομα Τύπου Αποδοχών"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Employee specific allowances and deductions"
@@ -428,6 +417,11 @@ msgstr ""
 msgid "Search Contract Type"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες"
+
 #~ msgid "Generalities"
 #~ msgstr "Generalities"
 
@@ -455,6 +449,9 @@ msgstr ""
 #~ msgid "Salary"
 #~ msgstr "Μισθός"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalid XML for View Architecture!"
+
 #~ msgid "Nationality"
 #~ msgstr "Εθνικότητα"
 
@@ -481,3 +478,6 @@ msgstr ""
 
 #~ msgid "Birth Date"
 #~ msgstr "Ημερ/νία Γέννησης"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
diff --git a/addons/hr_contract/i18n/es.po b/addons/hr_contract/i18n/es.po
index 1effe887b03..d95e087f68d 100644
--- a/addons/hr_contract/i18n/es.po
+++ b/addons/hr_contract/i18n/es.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-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/es_AR.po b/addons/hr_contract/i18n/es_AR.po
index fa508f57b70..50aeb7a3069 100644
--- a/addons/hr_contract/i18n/es_AR.po
+++ b/addons/hr_contract/i18n/es_AR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-15 20:56+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,23 +32,15 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
-"especial!"
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
+msgid "Function Arguments"
 msgstr ""
 
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
-msgstr "Neto"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
@@ -60,9 +52,9 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
-msgstr ""
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "Nombre de tipo de salario"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -75,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
-msgstr "Factor para el costo de hora"
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -90,8 +82,8 @@ msgid "Wage Types"
 msgstr "Tipos de salario"
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -107,14 +99,15 @@ msgid "Employee"
 msgstr "Empleado"
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "Neto"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -132,14 +125,15 @@ msgid "Function"
 msgstr "Función"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
-msgstr "Salario"
+#: view:hr.employee:0
+msgid "Description"
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -161,12 +155,6 @@ msgstr "Contratos"
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -234,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -244,9 +232,9 @@ msgid "End Date"
 msgstr "Fecha de fin"
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista!"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Salario"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -265,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr "Notas"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -350,10 +344,9 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
-msgstr ""
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
+msgstr "Factor para el costo de hora"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -361,15 +354,10 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
-msgstr "Nombre de tipo de salario"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Employee specific allowances and deductions"
diff --git a/addons/hr_contract/i18n/es_EC.po b/addons/hr_contract/i18n/es_EC.po
index afe8733dcfd..53ae1ecdb4f 100644
--- a/addons/hr_contract/i18n/es_EC.po
+++ b/addons/hr_contract/i18n/es_EC.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-19 00:01+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,23 +32,15 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
+msgid "Function Arguments"
 msgstr ""
 
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
-msgstr "Neto"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
@@ -60,9 +52,9 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
-msgstr ""
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "Nombre tipo de salario"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -75,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
-msgstr "Factor para el costo de hora"
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -90,8 +82,8 @@ msgid "Wage Types"
 msgstr "Tipos de salario"
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -107,14 +99,15 @@ msgid "Employee"
 msgstr "Empleado"
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "Neto"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -132,14 +125,15 @@ msgid "Function"
 msgstr "Función"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
-msgstr "Salario"
+#: view:hr.employee:0
+msgid "Description"
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -161,12 +155,6 @@ msgstr "Contratos"
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -234,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -244,9 +232,9 @@ msgid "End Date"
 msgstr "Fecha final"
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Salario"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -265,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr "Notas"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -350,10 +344,9 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
-msgstr ""
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
+msgstr "Factor para el costo de hora"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -361,15 +354,10 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
-msgstr "Nombre tipo de salario"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Employee specific allowances and deductions"
diff --git a/addons/hr_contract/i18n/et.po b/addons/hr_contract/i18n/et.po
index bc566c832fa..472f5d7fe90 100644
--- a/addons/hr_contract/i18n/et.po
+++ b/addons/hr_contract/i18n/et.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-09 17:38+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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,22 +32,15 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
-"Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
+msgid "Function Arguments"
 msgstr ""
 
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
-msgstr "Neto"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
@@ -59,9 +52,9 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
-msgstr ""
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "Töötasu tüübi nimi"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -74,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
-msgstr "Tunnitasu tegur"
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -89,8 +82,8 @@ msgid "Wage Types"
 msgstr "Töötasu tüübid"
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -106,14 +99,15 @@ msgid "Employee"
 msgstr "Töötaja"
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "Neto"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -131,14 +125,15 @@ msgid "Function"
 msgstr "Funktsioon"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
-msgstr "Töötasu"
+#: view:hr.employee:0
+msgid "Description"
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -160,12 +155,6 @@ msgstr "Lepingud"
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -233,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -243,9 +232,9 @@ msgid "End Date"
 msgstr "Lõppkuupäev"
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Töötasu"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -264,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr "Märkmed"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -349,10 +344,9 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
-msgstr ""
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
+msgstr "Tunnitasu tegur"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -360,15 +354,10 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
-msgstr "Töötasu tüübi nimi"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Employee specific allowances and deductions"
@@ -425,6 +414,17 @@ msgstr ""
 msgid "Search Contract Type"
 msgstr ""
 
+#~ 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 "Number of children"
 #~ msgstr "Laste arv"
 
diff --git a/addons/hr_contract/i18n/fi.po b/addons/hr_contract/i18n/fi.po
index f5b20079964..4719b9bd265 100644
--- a/addons/hr_contract/i18n/fi.po
+++ b/addons/hr_contract/i18n/fi.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 05:41+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: Finnish <fi@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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -33,19 +33,13 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
+msgid "Function Arguments"
 msgstr ""
 
 #. module: hr_contract
@@ -59,9 +53,9 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
-msgstr ""
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "Palkkatyypin nimi"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -74,13 +68,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
-msgstr "Tuntimaksun kerroin"
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -89,8 +83,8 @@ msgid "Wage Types"
 msgstr "Palkkatyypit"
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -106,13 +100,14 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
 msgstr ""
 
 #. module: hr_contract
@@ -131,14 +126,15 @@ msgid "Function"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
-msgstr "Palkka"
+#: view:hr.employee:0
+msgid "Description"
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -160,12 +156,6 @@ msgstr "Sopimukset"
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -233,8 +223,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -243,9 +233,9 @@ msgid "End Date"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Palkka"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -264,6 +254,12 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -349,10 +345,9 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
-msgstr ""
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
+msgstr "Tuntimaksun kerroin"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -360,15 +355,10 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
-msgstr "Palkkatyypin nimi"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Employee specific allowances and deductions"
diff --git a/addons/hr_contract/i18n/fr.po b/addons/hr_contract/i18n/fr.po
index 78175161852..980ea21b593 100644
--- a/addons/hr_contract/i18n/fr.po
+++ b/addons/hr_contract/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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-17 07:19+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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,23 +32,15 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
-"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
-"spéciaux !"
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
+msgid "Function Arguments"
 msgstr ""
 
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
-msgstr "Net"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
@@ -60,9 +52,9 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
-msgstr ""
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "Nom du Type de Salaire"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -75,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
-msgstr "Facteur pour le coût horaire"
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -90,8 +82,8 @@ msgid "Wage Types"
 msgstr "Types de Salaire"
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -107,14 +99,15 @@ msgid "Employee"
 msgstr "Employé"
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom du model invalide pour la définition de l'action."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "Net"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -132,14 +125,15 @@ msgid "Function"
 msgstr "Fonction"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
-msgstr "Salaire"
+#: view:hr.employee:0
+msgid "Description"
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -161,12 +155,6 @@ msgstr "Contrats"
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -234,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -244,9 +232,9 @@ msgid "End Date"
 msgstr "Date de fin"
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Salaire"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -265,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr "Notes"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -350,10 +344,9 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
-msgstr ""
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
+msgstr "Facteur pour le coût horaire"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -361,15 +354,10 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
-msgstr "Nom du Type de Salaire"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Employee specific allowances and deductions"
@@ -426,6 +414,12 @@ msgstr ""
 msgid "Search Contract Type"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+#~ "spéciaux !"
+
 #~ msgid "Generalities"
 #~ msgstr "Généralités"
 
@@ -450,6 +444,9 @@ msgstr ""
 #~ msgid "Salary"
 #~ msgstr "Salaire"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valide pour l'architecture de la vue"
+
 #~ msgid "Remuneration"
 #~ msgstr "Rémuneration"
 
@@ -468,5 +465,8 @@ msgstr ""
 #~ msgid "Contract Duration"
 #~ msgstr "Durée du Contrat"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom du model invalide pour la définition de l'action."
+
 #~ msgid "AUDIENS Number"
 #~ msgstr "Numéro AUDIENS"
diff --git a/addons/hr_contract/i18n/hi.po b/addons/hr_contract/i18n/hi.po
index ee6eae74ad3..6306598a6fc 100644
--- a/addons/hr_contract/i18n/hi.po
+++ b/addons/hr_contract/i18n/hi.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 05:41+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: Hindi <hi@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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -33,21 +33,15 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
+msgid "Function Arguments"
 msgstr ""
 
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
-msgstr "नेट"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
@@ -59,8 +53,8 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
 msgstr ""
 
 #. module: hr_contract
@@ -74,13 +68,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -89,8 +83,8 @@ msgid "Wage Types"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -106,14 +100,15 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "कार्य की परिभाषा में मॉडल का नाम अमान्य है."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "नेट"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -131,13 +126,14 @@ msgid "Function"
 msgstr "फंक्शन"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
+#: view:hr.employee:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_contract
@@ -160,12 +156,6 @@ msgstr ""
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -233,8 +223,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -243,9 +233,9 @@ msgid "End Date"
 msgstr "समाप्ति तिथि"
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "संरचना देखने के लिए अमान्य XML!"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -264,6 +254,12 @@ msgstr ""
 msgid "Notes"
 msgstr "टिप्पणियाँ"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -349,9 +345,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -360,13 +355,8 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_contract
@@ -423,8 +413,14 @@ msgstr ""
 msgid "Search Contract Type"
 msgstr ""
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "कार्य की परिभाषा में मॉडल का नाम अमान्य है."
+
 #~ msgid "Marital Status"
 #~ msgstr "वैवाहिक वस्तुस्थिति"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "संरचना देखने के लिए अमान्य XML!"
+
 #~ msgid "Manager"
 #~ msgstr "मैनेजर"
diff --git a/addons/hr_contract/i18n/hr.po b/addons/hr_contract/i18n/hr.po
index abd6e47eed1..d665e2da09e 100644
--- a/addons/hr_contract/i18n/hr.po
+++ b/addons/hr_contract/i18n/hr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-18 06:22+0000\n"
 "Last-Translator: Miro Glavić <glavicmiro@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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,22 +32,15 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
-"Naziv objekta mora početi sa x_ i ne smije sadržavati specijalne znakove !"
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
+msgid "Function Arguments"
 msgstr ""
 
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
-msgstr "Neto"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
@@ -59,9 +52,9 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
-msgstr ""
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "Naziv Vrste Ugovora"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -74,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
-msgstr "Faktor za utrošak po satu"
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -89,8 +82,8 @@ msgid "Wage Types"
 msgstr "Vrste Plata"
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -106,14 +99,15 @@ msgid "Employee"
 msgstr "Uposlenik"
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nevažeće ime modela u definiciji akcije."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "Neto"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -131,14 +125,15 @@ msgid "Function"
 msgstr "Funkcija"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
-msgstr "Plata"
+#: view:hr.employee:0
+msgid "Description"
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -160,12 +155,6 @@ msgstr "Ugovori"
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -233,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -243,9 +232,9 @@ msgid "End Date"
 msgstr "Završni Datum"
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za Arhitekturu Prikaza!"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Plata"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -264,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr "Bilješke"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -349,10 +344,9 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
-msgstr ""
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
+msgstr "Faktor za utrošak po satu"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -360,15 +354,10 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
-msgstr "Naziv Vrste Ugovora"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Employee specific allowances and deductions"
@@ -425,6 +414,11 @@ msgstr ""
 msgid "Search Contract Type"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta mora početi sa x_ i ne smije sadržavati specijalne znakove !"
+
 #~ msgid "Number of children"
 #~ msgstr "Broj djece"
 
@@ -446,6 +440,9 @@ msgstr ""
 #~ msgid "Working hours per day"
 #~ msgstr "Radnih dana dnevno"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nevažeći XML za Arhitekturu Prikaza!"
+
 #~ msgid "AUDIENS Number"
 #~ msgstr "AUDIENS Broj"
 
@@ -469,3 +466,6 @@ msgstr ""
 
 #~ msgid "Remuneration"
 #~ msgstr "Proračunavanje"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nevažeće ime modela u definiciji akcije."
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/hu.po b/addons/hr_contract/i18n/hu.po
index bb746e46c56..116d2112bf5 100644
--- a/addons/hr_contract/i18n/hu.po
+++ b/addons/hr_contract/i18n/hu.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,19 +32,13 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
+msgid "Function Arguments"
 msgstr ""
 
 #. module: hr_contract
@@ -58,8 +52,8 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
 msgstr ""
 
 #. module: hr_contract
@@ -73,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -88,8 +82,8 @@ msgid "Wage Types"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -105,13 +99,14 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
 msgstr ""
 
 #. module: hr_contract
@@ -130,13 +125,14 @@ msgid "Function"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
+#: view:hr.employee:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_contract
@@ -159,12 +155,6 @@ msgstr ""
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -232,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -242,8 +232,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:hr.contract,wage:0
+msgid "Wage"
 msgstr ""
 
 #. module: hr_contract
@@ -263,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -348,9 +344,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -359,13 +354,8 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/id.po b/addons/hr_contract/i18n/id.po
index e9178f4b6ab..b82e8af2d89 100644
--- a/addons/hr_contract/i18n/id.po
+++ b/addons/hr_contract/i18n/id.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-09 13:49+0000\n"
 "Last-Translator: <>\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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,19 +32,13 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
+msgid "Function Arguments"
 msgstr ""
 
 #. module: hr_contract
@@ -58,8 +52,8 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
 msgstr ""
 
 #. module: hr_contract
@@ -73,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -88,8 +82,8 @@ msgid "Wage Types"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -105,13 +99,14 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
 msgstr ""
 
 #. module: hr_contract
@@ -130,13 +125,14 @@ msgid "Function"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
+#: view:hr.employee:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_contract
@@ -159,12 +155,6 @@ msgstr ""
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -232,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -242,8 +232,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:hr.contract,wage:0
+msgid "Wage"
 msgstr ""
 
 #. module: hr_contract
@@ -263,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -348,9 +344,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -359,13 +354,8 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/it.po b/addons/hr_contract/i18n/it.po
index ef0415a6b31..3aa68d89455 100644
--- a/addons/hr_contract/i18n/it.po
+++ b/addons/hr_contract/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-18 10: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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,23 +32,15 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
+msgid "Function Arguments"
 msgstr ""
 
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
-msgstr "Netto"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
@@ -60,9 +52,9 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
-msgstr ""
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "Nome Tipo Retribuzione"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -75,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
-msgstr "Fattore di Costo Orario"
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -90,8 +82,8 @@ msgid "Wage Types"
 msgstr "Tipi Retribuzione"
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -107,14 +99,15 @@ msgid "Employee"
 msgstr "Dipendente"
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome modello non valido nella definizione dell'azione."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "Netto"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -132,14 +125,15 @@ msgid "Function"
 msgstr "Funzione"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
-msgstr "Retribuzione"
+#: view:hr.employee:0
+msgid "Description"
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -161,12 +155,6 @@ msgstr "Contratti"
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -234,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -244,9 +232,9 @@ msgid "End Date"
 msgstr "Data di fine"
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Retribuzione"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -265,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr "Note"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -350,10 +344,9 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
-msgstr ""
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
+msgstr "Fattore di Costo Orario"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -361,15 +354,10 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
-msgstr "Nome Tipo Retribuzione"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Employee specific allowances and deductions"
@@ -429,6 +417,12 @@ msgstr ""
 #~ msgid "AUDIENS Number"
 #~ msgstr "Numero AUDIENS"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
+
 #~ msgid "Generalities"
 #~ msgstr "Generalità"
 
@@ -453,6 +447,9 @@ msgstr ""
 #~ msgid "Salary"
 #~ msgstr "Salario"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per Visualizzazione Architettura!"
+
 #~ msgid "Remuneration"
 #~ msgstr "Remunerazione"
 
@@ -470,3 +467,6 @@ msgstr ""
 
 #~ msgid "Contract Duration"
 #~ msgstr "Durata Contratto"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome modello non valido nella definizione dell'azione."
diff --git a/addons/hr_contract/i18n/ko.po b/addons/hr_contract/i18n/ko.po
index 078b9858e5d..a32cfe3fda1 100644
--- a/addons/hr_contract/i18n/ko.po
+++ b/addons/hr_contract/i18n/ko.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-08 14:33+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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -33,21 +33,15 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
+msgid "Function Arguments"
 msgstr ""
 
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
-msgstr "순"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
@@ -59,9 +53,9 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
-msgstr ""
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "임금 타입 명칭"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -74,13 +68,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
-msgstr "시간 비용을 위한 펙터"
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -89,8 +83,8 @@ msgid "Wage Types"
 msgstr "임금 타입"
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -106,14 +100,15 @@ msgid "Employee"
 msgstr "직원"
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "순"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -131,14 +126,15 @@ msgid "Function"
 msgstr "기능"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
-msgstr "임금"
+#: view:hr.employee:0
+msgid "Description"
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -160,12 +156,6 @@ msgstr "계약"
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -233,8 +223,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -243,9 +233,9 @@ msgid "End Date"
 msgstr "종료 날짜"
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "임금"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -264,6 +254,12 @@ msgstr ""
 msgid "Notes"
 msgstr "노트"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -349,10 +345,9 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
-msgstr ""
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
+msgstr "시간 비용을 위한 펙터"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -360,15 +355,10 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
-msgstr "임금 타입 명칭"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Employee specific allowances and deductions"
diff --git a/addons/hr_contract/i18n/lt.po b/addons/hr_contract/i18n/lt.po
index bb746e46c56..116d2112bf5 100644
--- a/addons/hr_contract/i18n/lt.po
+++ b/addons/hr_contract/i18n/lt.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,19 +32,13 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
+msgid "Function Arguments"
 msgstr ""
 
 #. module: hr_contract
@@ -58,8 +52,8 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
 msgstr ""
 
 #. module: hr_contract
@@ -73,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -88,8 +82,8 @@ msgid "Wage Types"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -105,13 +99,14 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
 msgstr ""
 
 #. module: hr_contract
@@ -130,13 +125,14 @@ msgid "Function"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
+#: view:hr.employee:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_contract
@@ -159,12 +155,6 @@ msgstr ""
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -232,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -242,8 +232,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:hr.contract,wage:0
+msgid "Wage"
 msgstr ""
 
 #. module: hr_contract
@@ -263,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -348,9 +344,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -359,13 +354,8 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/lv.po b/addons/hr_contract/i18n/lv.po
index 007025035be..2566c09c954 100644
--- a/addons/hr_contract/i18n/lv.po
+++ b/addons/hr_contract/i18n/lv.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-10-22 14:30+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -33,19 +33,13 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
+msgid "Function Arguments"
 msgstr ""
 
 #. module: hr_contract
@@ -59,8 +53,8 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
 msgstr ""
 
 #. module: hr_contract
@@ -74,13 +68,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -89,8 +83,8 @@ msgid "Wage Types"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -106,13 +100,14 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
 msgstr ""
 
 #. module: hr_contract
@@ -131,13 +126,14 @@ msgid "Function"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
+#: view:hr.employee:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_contract
@@ -160,12 +156,6 @@ msgstr ""
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -233,8 +223,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -243,8 +233,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:hr.contract,wage:0
+msgid "Wage"
 msgstr ""
 
 #. module: hr_contract
@@ -264,6 +254,12 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -349,9 +345,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -360,13 +355,8 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/mn.po b/addons/hr_contract/i18n/mn.po
index 5b24a039da1..f4f04a4764d 100644
--- a/addons/hr_contract/i18n/mn.po
+++ b/addons/hr_contract/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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-27 08:08+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -33,22 +33,14 @@ msgid "Trial Period"
 msgstr "Туршилтын хугацаа"
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-"болохгүй!"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
+msgstr "Туршилтын үе эхлэх огноо"
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr "Тооцоолол"
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
-msgstr "Цэвэр"
+msgid "Function Arguments"
+msgstr "Функцийн хувьсагчууд"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -61,9 +53,9 @@ msgid "Company Vehicle"
 msgstr "Компанийн тээврийн хэрэгсэл"
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
-msgstr "Хэлтэс"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "Цалингийн төрлийн нэр"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -76,14 +68,14 @@ msgid "Current"
 msgstr "Одоогийн"
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
-msgstr "Цагийн өртөгийн фактор"
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr "Хэлтэс"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
-msgstr "Функцийн хувьсагчууд"
+#: view:hr.contract:0
+msgid "Overpassed"
+msgstr "Хугацаа нь өнгөрсөн"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -91,9 +83,9 @@ msgid "Wage Types"
 msgstr "Цалингийн төрлүүд"
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Алдаа! Рекурс цэсийг үүсгэж болохгүй"
+#: view:hr.employee:0
+msgid "Calculations"
+msgstr "Тооцоолол"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
@@ -108,14 +100,15 @@ msgid "Employee"
 msgstr "Ажилтан"
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
-msgstr "Туршилтын үе эхлэх огноо"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
+msgstr "Ажлын цагийн хуваарь"
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "Цэвэр"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -132,16 +125,17 @@ msgstr "Хугацааны мөчлөг"
 msgid "Function"
 msgstr "Үүрэг"
 
+#. module: hr_contract
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
+msgstr "Бүлэглэвэл..."
+
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Description"
 msgstr "Тайлбар"
 
-#. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
-msgstr "Цалин"
-
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
 msgid "Place of Birth"
@@ -162,12 +156,6 @@ msgstr "Гэрээнүүд"
 msgid "Is a Manager"
 msgstr "Менежер эсэх"
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr "Ажлын цагийн хуваарь"
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -235,9 +223,9 @@ msgid "Search Wage Type"
 msgstr "Цалин төрлийг хайх"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
-msgstr "Цалингийн хуудасны мөр"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
@@ -245,9 +233,9 @@ msgid "End Date"
 msgstr "Дуусах огноо"
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Дэлгэцийн XML алдаатай!"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Цалин"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -266,6 +254,12 @@ msgstr "Километрээр"
 msgid "Notes"
 msgstr "Тэмдэглэл"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -351,10 +345,9 @@ msgid "Trial End Date"
 msgstr "Туршилт хугацаа дуусах огноо"
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
-msgstr "Бүлэглэвэл..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
+msgstr "Цагийн өртөгийн фактор"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -362,14 +355,9 @@ msgid "Period"
 msgstr "Мөчлөг"
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr "Хугацаа нь өнгөрсөн"
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
-msgstr "Цалингийн төрлийн нэр"
+#: view:hr.employee:0
+msgid "Payslip Line"
+msgstr "Цалингийн хуудасны мөр"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -471,3 +459,18 @@ msgstr "Гэрээний төрлийг хайх"
 
 #~ msgid "Contract Duration"
 #~ msgstr "Гэрээний үргэлжлэх хугацаа"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+#~ "болохгүй!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Дэлгэцийн XML алдаатай!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Алдаа! Рекурс цэсийг үүсгэж болохгүй"
diff --git a/addons/hr_contract/i18n/nl.po b/addons/hr_contract/i18n/nl.po
index 26db144c9e4..deb10859b1b 100644
--- a/addons/hr_contract/i18n/nl.po
+++ b/addons/hr_contract/i18n/nl.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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-12-02 08: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-03 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,21 +32,14 @@ msgid "Trial Period"
 msgstr "Proeftijd"
 
 #. module: hr_contract
-#: 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!"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
+msgstr "Startdatum proeftijd"
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr "Berekeningen"
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
-msgstr "Netto"
+msgid "Function Arguments"
+msgstr "Functie argumenten"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -59,14 +52,9 @@ msgid "Company Vehicle"
 msgstr "Auto v/d zaak"
 
 #. module: hr_contract
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
-msgstr "Afdeling"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "Loonsoortnaam"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -79,14 +67,14 @@ msgid "Current"
 msgstr "Actueel"
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
-msgstr "Factor voor uurkosten"
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr "Afdeling"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
-msgstr "Functie argumenten"
+#: view:hr.contract:0
+msgid "Overpassed"
+msgstr "Overschreden"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -94,9 +82,9 @@ msgid "Wage Types"
 msgstr "Soorten lonen"
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fout ! U kunt geen recursief menu maken."
+#: view:hr.employee:0
+msgid "Calculations"
+msgstr "Berekeningen"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
@@ -111,14 +99,15 @@ msgid "Employee"
 msgstr "Medewerker"
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
-msgstr "Startdatum proeftijd"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
+msgstr "Werktijden"
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de actie-definitie."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "Netto"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -135,16 +124,17 @@ msgstr "Uren in de periode"
 msgid "Function"
 msgstr "Functie"
 
+#. module: hr_contract
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
+msgstr "Groepeer op..."
+
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Description"
 msgstr "Omschrijving"
 
-#. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
-msgstr "Loon"
-
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
 msgid "Place of Birth"
@@ -165,12 +155,6 @@ msgstr "Contracten"
 msgid "Is a Manager"
 msgstr "Is een manager"
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr "Werktijden"
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -238,9 +222,9 @@ msgid "Search Wage Type"
 msgstr "Loonsoort zoeken"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
-msgstr "Loonstrookregel"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
@@ -248,9 +232,9 @@ msgid "End Date"
 msgstr "Einddatum"
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Loon"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -269,6 +253,12 @@ msgstr "In kilometers"
 msgid "Notes"
 msgstr "Opmerkingen"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -354,15 +344,9 @@ msgid "Trial End Date"
 msgstr "Einddatum proeftijd"
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
-msgstr "Groepeer op..."
-
-#. module: hr_contract
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "De modulenaam moet uniek zijn !"
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
+msgstr "Factor voor uurkosten"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -370,14 +354,9 @@ msgid "Period"
 msgstr "Periode"
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr "Overschreden"
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
-msgstr "Loonsoortnaam"
+#: view:hr.employee:0
+msgid "Payslip Line"
+msgstr "Loonstrookregel"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -430,11 +409,6 @@ msgstr "Toelages"
 msgid "Main Data"
 msgstr "Hoofdgegevens"
 
-#. module: hr_contract
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
 #. module: hr_contract
 #: view:hr.contract.type:0
 msgid "Search Contract Type"
@@ -458,6 +432,11 @@ msgstr "Contractsoort zoeken"
 #~ msgid "Generalities"
 #~ msgstr "Algemeenheden"
 
+#~ 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 "Marital Status"
 #~ msgstr "Burgerlijke staat"
 
@@ -467,9 +446,15 @@ msgstr "Contractsoort zoeken"
 #~ msgid "Working hours per day"
 #~ msgstr "Werkuren per dag"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML voor weergave!"
+
 #~ msgid "Manager"
 #~ msgstr "Manager"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ongeldige modelnaam in de actie-definitie."
+
 #~ msgid "Contract Wage Type"
 #~ msgstr "Soort loon contract"
 
@@ -484,3 +469,15 @@ msgstr "Contractsoort zoeken"
 
 #~ msgid "Contract Duration"
 #~ msgstr "Contractduur"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fout ! U kunt geen recursief menu maken."
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "De modulenaam moet uniek zijn !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
diff --git a/addons/hr_contract/i18n/nl_BE.po b/addons/hr_contract/i18n/nl_BE.po
index 99ce42329c2..ee3a46d0df6 100644
--- a/addons/hr_contract/i18n/nl_BE.po
+++ b/addons/hr_contract/i18n/nl_BE.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-04-24 15:45+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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,20 +32,13 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
+msgid "Function Arguments"
 msgstr ""
 
 #. module: hr_contract
@@ -59,8 +52,8 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
 msgstr ""
 
 #. module: hr_contract
@@ -74,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -89,8 +82,8 @@ msgid "Wage Types"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -106,13 +99,14 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
 msgstr ""
 
 #. module: hr_contract
@@ -131,13 +125,14 @@ msgid "Function"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
+#: view:hr.employee:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_contract
@@ -160,12 +155,6 @@ msgstr ""
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -233,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -243,8 +232,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:hr.contract,wage:0
+msgid "Wage"
 msgstr ""
 
 #. module: hr_contract
@@ -264,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -349,9 +344,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -360,13 +354,8 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_contract
@@ -422,3 +411,8 @@ msgstr ""
 #: view:hr.contract.type:0
 msgid "Search Contract Type"
 msgstr ""
+
+#~ 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 karakters bevatten !"
diff --git a/addons/hr_contract/i18n/pl.po b/addons/hr_contract/i18n/pl.po
index 618fb4a3cda..1a323e086bc 100644
--- a/addons/hr_contract/i18n/pl.po
+++ b/addons/hr_contract/i18n/pl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 05:42+0000\n"
 "Last-Translator: Jarosław Ogrodnik <nobodythere@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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,23 +32,15 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
-"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-"specjalnych !"
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
+msgid "Function Arguments"
 msgstr ""
 
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
-msgstr "Sieć"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
@@ -60,9 +52,9 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
-msgstr ""
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "Nazwa typu stawki"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -75,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -90,8 +82,8 @@ msgid "Wage Types"
 msgstr "Typy stawek"
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -107,14 +99,15 @@ msgid "Employee"
 msgstr "Pracownik"
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "Sieć"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -132,14 +125,15 @@ msgid "Function"
 msgstr "Funkcja"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
-msgstr "Þłaca"
+#: view:hr.employee:0
+msgid "Description"
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -161,12 +155,6 @@ msgstr "Umowy"
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -234,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -244,9 +232,9 @@ msgid "End Date"
 msgstr "Data zakończenia"
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Þłaca"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -265,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr "Uwagi"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -350,9 +344,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -361,15 +354,10 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
-msgstr "Nazwa typu stawki"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Employee specific allowances and deductions"
@@ -424,6 +412,12 @@ msgstr ""
 msgid "Search Contract Type"
 msgstr ""
 
+#~ 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 "Marital Status"
 #~ msgstr "Stan cywilny"
 
@@ -442,6 +436,9 @@ msgstr ""
 #~ msgid "Salary"
 #~ msgstr "Wynagrodzenie"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
 #~ msgid "Contract Name"
 #~ msgstr "Nazwa umowy"
 
diff --git a/addons/hr_contract/i18n/pt.po b/addons/hr_contract/i18n/pt.po
index db1c06a8858..335db7d0a17 100644
--- a/addons/hr_contract/i18n/pt.po
+++ b/addons/hr_contract/i18n/pt.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:12+0000\n"
-"PO-Revision-Date: 2010-11-27 14:34+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-14 19:14+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <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-11-28 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,22 +32,14 @@ msgid "Trial Period"
 msgstr "Período de teste"
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
-"O nome do Objecto deve começar com x_ e não pode conter nenhum carácter "
-"especial !"
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr "Cálculos"
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
-msgstr "Líquido"
+msgid "Function Arguments"
+msgstr ""
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -60,14 +52,9 @@ msgid "Company Vehicle"
 msgstr "Veículo da empresa"
 
 #. module: hr_contract
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "O ID do certificado do módulo tem de ser único!"
-
-#. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
-msgstr "Departamento"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "Nome do Tipo de Salário"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -80,13 +67,13 @@ msgid "Current"
 msgstr "Actual"
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
-msgstr "Factor de custo por hora"
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr "Departamento"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -95,9 +82,9 @@ msgid "Wage Types"
 msgstr "Tipos de Salário"
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Erro ! Não pode criar menus recursivos"
+#: view:hr.employee:0
+msgid "Calculations"
+msgstr "Cálculos"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
@@ -112,14 +99,15 @@ msgid "Employee"
 msgstr "Funcionário"
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
-msgstr ""
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
+msgstr "Horário de trabalho"
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da acção."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "Líquido"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -136,16 +124,17 @@ msgstr "Horas no período"
 msgid "Function"
 msgstr "Função"
 
+#. module: hr_contract
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Description"
 msgstr "Descrição"
 
-#. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
-msgstr "Salário"
-
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
 msgid "Place of Birth"
@@ -166,12 +155,6 @@ msgstr "Contratos"
 msgid "Is a Manager"
 msgstr "É gerente"
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr "Horário de trabalho"
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -208,7 +191,7 @@ msgstr "Nome do Período"
 #: field:hr.contract,advantages:0
 #: view:hr.employee:0
 msgid "Advantages"
-msgstr ""
+msgstr "Vantagens"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -239,9 +222,9 @@ msgid "Search Wage Type"
 msgstr "Procurar tipo de salário"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
-msgstr ""
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Erro! Não pode criar hierarquias de funcionários recursivamente."
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
@@ -249,9 +232,9 @@ msgid "End Date"
 msgstr "Data de Final"
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML Inválido para a Arquitectura de Vista !"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Salário"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -270,6 +253,13 @@ msgstr "Em quilómetros"
 msgid "Notes"
 msgstr "Notas"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+"Erro! Não pode seleccionar um departamento cujo gestor é o empregado."
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -304,7 +294,7 @@ msgstr ""
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Salary Computation"
-msgstr ""
+msgstr "Cálculo de salário"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -332,7 +322,7 @@ msgstr "Período Salarial"
 #. module: hr_contract
 #: field:hr.employee,vehicle_distance:0
 msgid "Home-Work Distance"
-msgstr ""
+msgstr "Distância entre casa e o trabalho"
 
 #. module: hr_contract
 #: field:hr.contract,date_start:0
@@ -342,7 +332,7 @@ msgstr "Data de Início"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Company contribution"
-msgstr ""
+msgstr "Contribuição da empresa"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,type:0
@@ -355,15 +345,9 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: hr_contract
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo deve ser único!"
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
+msgstr "Factor de custo por hora"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -371,15 +355,10 @@ msgid "Period"
 msgstr "Período"
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
-msgstr "Nome do Tipo de Salário"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Employee specific allowances and deductions"
@@ -388,12 +367,12 @@ msgstr ""
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Contract Details"
-msgstr ""
+msgstr "Detalhes do contrato"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Salary Structure"
-msgstr ""
+msgstr "Estrutura do salário"
 
 #. module: hr_contract
 #: help:hr.contract.wage.type,factor_type:0
@@ -431,11 +410,6 @@ msgstr ""
 msgid "Main Data"
 msgstr ""
 
-#. module: hr_contract
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
 #. module: hr_contract
 #: view:hr.contract.type:0
 msgid "Search Contract Type"
@@ -455,3 +429,27 @@ msgstr "Procurar o tipo de contrato"
 
 #~ msgid "Manager"
 #~ msgstr "Gestor"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum carácter "
+#~ "especial !"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de modelo inválido na definição da acção."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML Inválido para a Arquitectura de Vista !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID do certificado do módulo tem de ser único!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Erro ! Não pode criar menus recursivos"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "O nome do módulo deve ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
diff --git a/addons/hr_contract/i18n/pt_BR.po b/addons/hr_contract/i18n/pt_BR.po
index 35fd7356658..77eb82ff29e 100644
--- a/addons/hr_contract/i18n/pt_BR.po
+++ b/addons/hr_contract/i18n/pt_BR.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-17 07:18+0000\n"
 "Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,23 +32,15 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
-"O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-"especial!"
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
+msgid "Function Arguments"
 msgstr ""
 
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
-msgstr "Líquido"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
@@ -60,8 +52,8 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
 msgstr ""
 
 #. module: hr_contract
@@ -75,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -90,8 +82,8 @@ msgid "Wage Types"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -107,14 +99,15 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "Líquido"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -132,13 +125,14 @@ msgid "Function"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
+#: view:hr.employee:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_contract
@@ -161,12 +155,6 @@ msgstr ""
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -234,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -244,9 +232,9 @@ msgid "End Date"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -265,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr "Notas"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -350,9 +344,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -361,13 +354,8 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_contract
@@ -424,6 +412,15 @@ msgstr ""
 msgid "Search Contract Type"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
+#~ "especial!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalido XML para Arquitetura da View"
+
 #~ msgid "Miscelleanous"
 #~ msgstr "Variados"
 
diff --git a/addons/hr_contract/i18n/ro.po b/addons/hr_contract/i18n/ro.po
index f405fd70012..569d46ed970 100644
--- a/addons/hr_contract/i18n/ro.po
+++ b/addons/hr_contract/i18n/ro.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-08 13:37+0000\n"
 "Last-Translator: filsys <office@filsystem.ro>\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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,19 +32,13 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
+msgid "Function Arguments"
 msgstr ""
 
 #. module: hr_contract
@@ -58,8 +52,8 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
 msgstr ""
 
 #. module: hr_contract
@@ -73,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -88,8 +82,8 @@ msgid "Wage Types"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -105,13 +99,14 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
 msgstr ""
 
 #. module: hr_contract
@@ -130,13 +125,14 @@ msgid "Function"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
+#: view:hr.employee:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_contract
@@ -159,12 +155,6 @@ msgstr ""
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -232,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -242,8 +232,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:hr.contract,wage:0
+msgid "Wage"
 msgstr ""
 
 #. module: hr_contract
@@ -263,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -348,9 +344,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -359,13 +354,8 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/ru.po b/addons/hr_contract/i18n/ru.po
index d49d093ea16..71f993675fe 100644
--- a/addons/hr_contract/i18n/ru.po
+++ b/addons/hr_contract/i18n/ru.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 05:43+0000\n"
 "Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,23 +32,15 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
+msgid "Function Arguments"
 msgstr ""
 
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
-msgstr "Сумма на руки"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
@@ -60,9 +52,9 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
-msgstr ""
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "Название типов зарплаты"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -75,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
-msgstr "Множитель стоимости часа"
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -90,8 +82,8 @@ msgid "Wage Types"
 msgstr "Типы зарплаты"
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -107,14 +99,15 @@ msgid "Employee"
 msgstr "Сотрудник"
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "Сумма на руки"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -132,14 +125,15 @@ msgid "Function"
 msgstr "Функция"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
-msgstr "Зарплата"
+#: view:hr.employee:0
+msgid "Description"
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -161,12 +155,6 @@ msgstr "Договоры"
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -234,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -244,9 +232,9 @@ msgid "End Date"
 msgstr "Дата окончания"
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Зарплата"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -265,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr "Примечания"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -350,10 +344,9 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
-msgstr ""
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
+msgstr "Множитель стоимости часа"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -361,15 +354,10 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
-msgstr "Название типов зарплаты"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Employee specific allowances and deductions"
@@ -426,6 +414,12 @@ msgstr ""
 msgid "Search Contract Type"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
+
 #~ msgid "Number of children"
 #~ msgstr "Кол-во детей"
 
@@ -447,6 +441,9 @@ msgstr ""
 #~ msgid "Salary"
 #~ msgstr "Жалование"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра архитектуры!"
+
 #~ msgid "Remuneration"
 #~ msgstr "Вознаграждение"
 
@@ -465,6 +462,9 @@ msgstr ""
 #~ msgid "Contract Duration"
 #~ msgstr "Продолжительность договора"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Недопустимое имя модели в определении действия."
+
 #~ msgid "AUDIENS Number"
 #~ msgstr "Номер посещения"
 
diff --git a/addons/hr_contract/i18n/sl.po b/addons/hr_contract/i18n/sl.po
index 4d4e51ddace..215c3ab4500 100644
--- a/addons/hr_contract/i18n/sl.po
+++ b/addons/hr_contract/i18n/sl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 05:43+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,22 +32,15 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
+msgid "Function Arguments"
 msgstr ""
 
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
-msgstr "Neto"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
@@ -59,9 +52,9 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
-msgstr ""
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "Naziv vrste plačila"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -74,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
-msgstr "Faktor za urni strošek"
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -89,8 +82,8 @@ msgid "Wage Types"
 msgstr "Vrste plačil"
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -106,14 +99,15 @@ msgid "Employee"
 msgstr "Zaposlenec"
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Napačno ime modela v definiciji dejanja."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "Neto"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -131,14 +125,15 @@ msgid "Function"
 msgstr "Funkcija"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
-msgstr "Plača"
+#: view:hr.employee:0
+msgid "Description"
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -160,12 +155,6 @@ msgstr "Pogodbe"
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -233,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -243,9 +232,9 @@ msgid "End Date"
 msgstr "Končni datum"
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Plača"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -264,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr "Opombe"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -349,10 +344,9 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
-msgstr ""
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
+msgstr "Faktor za urni strošek"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -360,15 +354,10 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
-msgstr "Naziv vrste plačila"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Employee specific allowances and deductions"
@@ -425,6 +414,14 @@ msgstr ""
 msgid "Search Contract Type"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda."
+
 #~ msgid "Number of children"
 #~ msgstr "Število otrok"
 
@@ -440,6 +437,9 @@ msgstr ""
 #~ msgid "Generalities"
 #~ msgstr "Splošno"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Napačno ime modela v definiciji dejanja."
+
 #~ msgid "Working hours per day"
 #~ msgstr "Delovne ure na dan"
 
diff --git a/addons/hr_contract/i18n/sq.po b/addons/hr_contract/i18n/sq.po
index a7ecf41c588..01772c774e5 100644
--- a/addons/hr_contract/i18n/sq.po
+++ b/addons/hr_contract/i18n/sq.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -33,19 +33,13 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
+msgid "Function Arguments"
 msgstr ""
 
 #. module: hr_contract
@@ -59,8 +53,8 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
 msgstr ""
 
 #. module: hr_contract
@@ -74,13 +68,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -89,8 +83,8 @@ msgid "Wage Types"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -106,13 +100,14 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
 msgstr ""
 
 #. module: hr_contract
@@ -131,13 +126,14 @@ msgid "Function"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
+#: view:hr.employee:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_contract
@@ -160,12 +156,6 @@ msgstr ""
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -233,8 +223,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -243,8 +233,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:hr.contract,wage:0
+msgid "Wage"
 msgstr ""
 
 #. module: hr_contract
@@ -264,6 +254,12 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -349,9 +345,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -360,13 +355,8 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/sr.po b/addons/hr_contract/i18n/sr.po
index 867e8a572e2..3f63757036d 100644
--- a/addons/hr_contract/i18n/sr.po
+++ b/addons/hr_contract/i18n/sr.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-12-28 10:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -33,19 +33,13 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
+msgid "Function Arguments"
 msgstr ""
 
 #. module: hr_contract
@@ -59,8 +53,8 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
 msgstr ""
 
 #. module: hr_contract
@@ -74,13 +68,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -89,8 +83,8 @@ msgid "Wage Types"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -106,13 +100,14 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
 msgstr ""
 
 #. module: hr_contract
@@ -131,13 +126,14 @@ msgid "Function"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
+#: view:hr.employee:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_contract
@@ -160,12 +156,6 @@ msgstr ""
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -233,8 +223,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -243,8 +233,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:hr.contract,wage:0
+msgid "Wage"
 msgstr ""
 
 #. module: hr_contract
@@ -264,6 +254,12 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -349,9 +345,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -360,13 +355,8 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/sr@latin.po b/addons/hr_contract/i18n/sr@latin.po
index 782ca28ca05..ead599bb0c3 100644
--- a/addons/hr_contract/i18n/sr@latin.po
+++ b/addons/hr_contract/i18n/sr@latin.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-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/sv.po b/addons/hr_contract/i18n/sv.po
index 4c7f53ffc29..9695aad16fe 100644
--- a/addons/hr_contract/i18n/sv.po
+++ b/addons/hr_contract/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-23 09:29+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-11-24 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,20 +32,13 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
+msgid "Function Arguments"
 msgstr ""
 
 #. module: hr_contract
@@ -59,13 +52,8 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
 msgstr ""
 
 #. module: hr_contract
@@ -79,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -94,8 +82,8 @@ msgid "Wage Types"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -111,13 +99,14 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
 msgstr ""
 
 #. module: hr_contract
@@ -136,13 +125,14 @@ msgid "Function"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
+#: view:hr.employee:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_contract
@@ -165,12 +155,6 @@ msgstr ""
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -238,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -248,8 +232,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:hr.contract,wage:0
+msgid "Wage"
 msgstr ""
 
 #. module: hr_contract
@@ -269,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr "Anteckningar"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -354,14 +344,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
-msgstr ""
-
-#. module: hr_contract
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -370,13 +354,8 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_contract
@@ -428,12 +407,12 @@ msgstr ""
 msgid "Main Data"
 msgstr ""
 
-#. module: hr_contract
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract.type:0
 msgid "Search Contract Type"
 msgstr ""
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
diff --git a/addons/hr_contract/i18n/tlh.po b/addons/hr_contract/i18n/tlh.po
index a3174bf6995..cc4abf60940 100644
--- a/addons/hr_contract/i18n/tlh.po
+++ b/addons/hr_contract/i18n/tlh.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,19 +32,13 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
+msgid "Function Arguments"
 msgstr ""
 
 #. module: hr_contract
@@ -58,8 +52,8 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
 msgstr ""
 
 #. module: hr_contract
@@ -73,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -88,8 +82,8 @@ msgid "Wage Types"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -105,13 +99,14 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
 msgstr ""
 
 #. module: hr_contract
@@ -130,13 +125,14 @@ msgid "Function"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
+#: view:hr.employee:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_contract
@@ -159,12 +155,6 @@ msgstr ""
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -232,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -242,8 +232,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:hr.contract,wage:0
+msgid "Wage"
 msgstr ""
 
 #. module: hr_contract
@@ -263,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -348,9 +344,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -359,13 +354,8 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/tr.po b/addons/hr_contract/i18n/tr.po
index e2fcda6e1ec..0e925b613fa 100644
--- a/addons/hr_contract/i18n/tr.po
+++ b/addons/hr_contract/i18n/tr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-09 07:17+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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,19 +32,13 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
+msgid "Function Arguments"
 msgstr ""
 
 #. module: hr_contract
@@ -58,9 +52,9 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
-msgstr ""
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "Ücret Tipi Adı"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -73,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -88,8 +82,8 @@ msgid "Wage Types"
 msgstr "Ücret Tipleri"
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -105,13 +99,14 @@ msgid "Employee"
 msgstr "Personel"
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
 msgstr ""
 
 #. module: hr_contract
@@ -130,14 +125,15 @@ msgid "Function"
 msgstr "Pozisyon"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
-msgstr "Ücret"
+#: view:hr.employee:0
+msgid "Description"
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -159,12 +155,6 @@ msgstr "Sözleşmeler"
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -232,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -242,9 +232,9 @@ msgid "End Date"
 msgstr "Bitiş Tarihi"
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Ücret"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -263,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr "Notlar"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -348,9 +344,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -359,15 +354,10 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
-msgstr "Ücret Tipi Adı"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Employee specific allowances and deductions"
@@ -422,6 +412,9 @@ msgstr ""
 msgid "Search Contract Type"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
+
 #~ msgid "Generalities"
 #~ msgstr "Genel Bilgi"
 
diff --git a/addons/hr_contract/i18n/uk.po b/addons/hr_contract/i18n/uk.po
index 3cc0ea0b297..342bf46c737 100644
--- a/addons/hr_contract/i18n/uk.po
+++ b/addons/hr_contract/i18n/uk.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 12:27+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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,20 +32,13 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
-"Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
+msgid "Function Arguments"
 msgstr ""
 
 #. module: hr_contract
@@ -59,8 +52,8 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
 msgstr ""
 
 #. module: hr_contract
@@ -74,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -89,8 +82,8 @@ msgid "Wage Types"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -106,13 +99,14 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
 msgstr ""
 
 #. module: hr_contract
@@ -131,13 +125,14 @@ msgid "Function"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
+#: view:hr.employee:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_contract
@@ -160,12 +155,6 @@ msgstr ""
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -233,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -243,9 +232,9 @@ msgid "End Date"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури Вигляду!"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr ""
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -264,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr "Примітки"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -349,9 +344,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -360,13 +354,8 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_contract
@@ -422,3 +411,11 @@ msgstr ""
 #: view:hr.contract.type:0
 msgid "Search Contract Type"
 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 для Архітектури Вигляду!"
diff --git a/addons/hr_contract/i18n/vi.po b/addons/hr_contract/i18n/vi.po
index d86f5d3e334..21b20ad87ff 100644
--- a/addons/hr_contract/i18n/vi.po
+++ b/addons/hr_contract/i18n/vi.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -33,19 +33,13 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
+msgid "Function Arguments"
 msgstr ""
 
 #. module: hr_contract
@@ -59,8 +53,8 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
 msgstr ""
 
 #. module: hr_contract
@@ -74,13 +68,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -89,8 +83,8 @@ msgid "Wage Types"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -106,13 +100,14 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
 msgstr ""
 
 #. module: hr_contract
@@ -131,13 +126,14 @@ msgid "Function"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
+#: view:hr.employee:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_contract
@@ -160,12 +156,6 @@ msgstr ""
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -233,8 +223,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -243,8 +233,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:hr.contract,wage:0
+msgid "Wage"
 msgstr ""
 
 #. module: hr_contract
@@ -264,6 +254,12 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -349,9 +345,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -360,13 +355,8 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/zh_CN.po b/addons/hr_contract/i18n/zh_CN.po
index 0835fe14bb7..06ec65b1c53 100644
--- a/addons/hr_contract/i18n/zh_CN.po
+++ b/addons/hr_contract/i18n/zh_CN.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-08-03 05:44+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -29,73 +29,67 @@ msgstr "总数"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Trial Period"
-msgstr ""
+msgstr "试用期"
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
-
-#. module: hr_contract
-#: view:hr.employee:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
-msgstr "净值"
-
-#. module: hr_contract
-#: view:hr.employee:0
-msgid "Medical Examination"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.employee,vehicle:0
-msgid "Company Vehicle"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
-msgstr ""
-
-#. module: hr_contract
-#: view:hr.employee:0
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: hr_contract
-#: view:hr.contract:0
-msgid "Current"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
-msgstr "每小时成本系数"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
+msgstr "使用期开始日期"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Function Arguments"
 msgstr ""
 
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Medical Examination"
+msgstr "体检"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle:0
+msgid "Company Vehicle"
+msgstr "公司车辆"
+
+#. module: hr_contract
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "工资类型名称"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Miscellaneous"
+msgstr "其它"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Current"
+msgstr "当前的"
+
+#. module: hr_contract
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr "部门"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Overpassed"
+msgstr ""
+
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Wage Types"
 msgstr "工资类型"
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: view:hr.employee:0
+msgid "Calculations"
+msgstr "计算"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Basic"
-msgstr ""
+msgstr "基本信息"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -105,14 +99,15 @@ msgid "Employee"
 msgstr "员工"
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
-msgstr ""
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
+msgstr "工作安排"
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "在动作定义使用了无效的模块名。"
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "净值"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -130,14 +125,15 @@ msgid "Function"
 msgstr "职能"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
-msgstr ""
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
+msgstr "分组于"
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
-msgstr "工资"
+#: view:hr.employee:0
+msgid "Description"
+msgstr "描述"
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -157,39 +153,33 @@ msgstr "合同"
 #. module: hr_contract
 #: field:hr.employee,manager:0
 msgid "Is a Manager"
-msgstr ""
-
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-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
@@ -201,7 +191,7 @@ msgstr "周期名称"
 #: field:hr.contract,advantages:0
 #: view:hr.employee:0
 msgid "Advantages"
-msgstr ""
+msgstr "优点"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -218,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
-#: view:hr.employee:0
-msgid "Payslip Line"
-msgstr ""
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "错误！您不能创建循环的员工等级。"
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
@@ -242,19 +232,19 @@ msgid "End Date"
 msgstr "结束日期"
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效的视图结构xml文件!"
+#: field:hr.contract,wage:0
+msgid "Wage"
+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
@@ -263,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr "备注"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -297,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
@@ -314,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
@@ -325,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
@@ -335,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
@@ -345,13 +341,12 @@ msgstr "类型"
 #. module: hr_contract
 #: field:hr.contract,trial_date_end:0
 msgid "Trial End Date"
-msgstr ""
+msgstr "试用期截至日期"
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
-msgstr ""
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
+msgstr "每小时成本系数"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -359,15 +354,10 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
-msgstr "工资类型名称"
-
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Employee specific allowances and deductions"
@@ -376,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
@@ -394,7 +384,7 @@ msgstr "这字段使用时间表系统来计算合同员工的每小时工价"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Personal Info"
-msgstr ""
+msgstr "个人信息"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -405,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
@@ -420,7 +410,7 @@ msgstr ""
 #. module: hr_contract
 #: view:hr.contract.type:0
 msgid "Search Contract Type"
-msgstr ""
+msgstr "搜索合同类型"
 
 #~ msgid "Miscelleanous"
 #~ msgstr "杂项"
@@ -437,6 +427,10 @@ msgstr ""
 #~ msgid "Remuneration"
 #~ msgstr "报酬"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+
 #~ msgid "Generalities"
 #~ msgstr "概论"
 
@@ -485,3 +479,9 @@ msgstr ""
 
 #~ msgid "Contract Duration"
 #~ msgstr "合同有效期"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "在动作定义使用了无效的模块名。"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效的视图结构xml文件!"
diff --git a/addons/hr_contract/i18n/zh_TW.po b/addons/hr_contract/i18n/zh_TW.po
index 7dc2aa32b34..bf0bce2ff51 100644
--- a/addons/hr_contract/i18n/zh_TW.po
+++ b/addons/hr_contract/i18n/zh_TW.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-01-30 13:22+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-10-30 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -32,19 +32,13 @@ msgid "Trial Period"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
 msgstr ""
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
+msgid "Function Arguments"
 msgstr ""
 
 #. module: hr_contract
@@ -58,8 +52,8 @@ msgid "Company Vehicle"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
 msgstr ""
 
 #. module: hr_contract
@@ -73,13 +67,13 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Overpassed"
 msgstr ""
 
 #. module: hr_contract
@@ -88,8 +82,8 @@ msgid "Wage Types"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.employee:0
+msgid "Calculations"
 msgstr ""
 
 #. module: hr_contract
@@ -105,13 +99,14 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,trial_date_start:0
-msgid "Trial Start Date"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
 msgstr ""
 
 #. module: hr_contract
@@ -130,13 +125,14 @@ msgid "Function"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
+#: view:hr.employee:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_contract
@@ -159,12 +155,6 @@ msgstr ""
 msgid "Is a Manager"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
@@ -232,8 +222,8 @@ msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_contract
@@ -242,8 +232,8 @@ msgid "End Date"
 msgstr ""
 
 #. module: hr_contract
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:hr.contract,wage:0
+msgid "Wage"
 msgstr ""
 
 #. module: hr_contract
@@ -263,6 +253,12 @@ msgstr ""
 msgid "Notes"
 msgstr "注解"
 
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
@@ -348,9 +344,8 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -359,13 +354,8 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Overpassed"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
+#: view:hr.employee:0
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_contract
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 7ffb40e1c8d..d00f69bc0de 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/de.po b/addons/hr_evaluation/i18n/de.po
index 2a04c718c4f..09b2ef42de4 100644
--- a/addons/hr_evaluation/i18n/de.po
+++ b/addons/hr_evaluation/i18n/de.po
@@ -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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/es.po b/addons/hr_evaluation/i18n/es.po
index cba7f2a724a..78cfe2dfe70 100644
--- a/addons/hr_evaluation/i18n/es.po
+++ b/addons/hr_evaluation/i18n/es.po
@@ -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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/es_EC.po b/addons/hr_evaluation/i18n/es_EC.po
index 6c41e5257cc..efd2fddc7cb 100644
--- a/addons/hr_evaluation/i18n/es_EC.po
+++ b/addons/hr_evaluation/i18n/es_EC.po
@@ -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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/et.po b/addons/hr_evaluation/i18n/et.po
index 8c4527ba1e5..e7379dd4576 100644
--- a/addons/hr_evaluation/i18n/et.po
+++ b/addons/hr_evaluation/i18n/et.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/fi.po b/addons/hr_evaluation/i18n/fi.po
index 4e4b9539f13..5132664024b 100644
--- a/addons/hr_evaluation/i18n/fi.po
+++ b/addons/hr_evaluation/i18n/fi.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/fr.po b/addons/hr_evaluation/i18n/fr.po
index 976d523b3df..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-14 05:33+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.po b/addons/hr_evaluation/i18n/hr.po
index 2e7e9bc0e54..ec09b7afb45 100644
--- a/addons/hr_evaluation/i18n/hr.po
+++ b/addons/hr_evaluation/i18n/hr.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
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/i18n/id.po b/addons/hr_evaluation/i18n/id.po
index 75c385ca844..a3a30b0b9b8 100644
--- a/addons/hr_evaluation/i18n/id.po
+++ b/addons/hr_evaluation/i18n/id.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/it.po b/addons/hr_evaluation/i18n/it.po
index c747067420f..29772a6f0b9 100644
--- a/addons/hr_evaluation/i18n/it.po
+++ b/addons/hr_evaluation/i18n/it.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/mn.po b/addons/hr_evaluation/i18n/mn.po
index 9dd07759ba0..dc4afe55342 100644
--- a/addons/hr_evaluation/i18n/mn.po
+++ b/addons/hr_evaluation/i18n/mn.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/nl.po b/addons/hr_evaluation/i18n/nl.po
index ca179830bbe..1bb937b3ade 100644
--- a/addons/hr_evaluation/i18n/nl.po
+++ b/addons/hr_evaluation/i18n/nl.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/pt.po b/addons/hr_evaluation/i18n/pt.po
index 978b6bc8405..cbf8bb90650 100644
--- a/addons/hr_evaluation/i18n/pt.po
+++ b/addons/hr_evaluation/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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/ru.po b/addons/hr_evaluation/i18n/ru.po
index 389f3839be7..072a0921ee3 100644
--- a/addons/hr_evaluation/i18n/ru.po
+++ b/addons/hr_evaluation/i18n/ru.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/sr@latin.po b/addons/hr_evaluation/i18n/sr@latin.po
index 49458203df5..7fd766593be 100644
--- a/addons/hr_evaluation/i18n/sr@latin.po
+++ b/addons/hr_evaluation/i18n/sr@latin.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/sv.po b/addons/hr_evaluation/i18n/sv.po
index 08e0d478769..5d612a4df8b 100644
--- a/addons/hr_evaluation/i18n/sv.po
+++ b/addons/hr_evaluation/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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/zh_CN.po b/addons/hr_evaluation/i18n/zh_CN.po
index bfbbe05ed81..9fd1d890a88 100644
--- a/addons/hr_evaluation/i18n/zh_CN.po
+++ b/addons/hr_evaluation/i18n/zh_CN.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
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 99889e0b4c4..59a64d2eb4a 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/ar.po b/addons/hr_expense/i18n/ar.po
index 0b4655e3f5d..b2a14da10f5 100644
--- a/addons/hr_expense/i18n/ar.po
+++ b/addons/hr_expense/i18n/ar.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/bg.po b/addons/hr_expense/i18n/bg.po
index e720e7da851..13bc30b6cf9 100644
--- a/addons/hr_expense/i18n/bg.po
+++ b/addons/hr_expense/i18n/bg.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/bs.po b/addons/hr_expense/i18n/bs.po
index 80cfa7af8ea..a88a12d8951 100644
--- a/addons/hr_expense/i18n/bs.po
+++ b/addons/hr_expense/i18n/bs.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/ca.po b/addons/hr_expense/i18n/ca.po
index 60d8f073566..1083310d0d3 100644
--- a/addons/hr_expense/i18n/ca.po
+++ b/addons/hr_expense/i18n/ca.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/cs.po b/addons/hr_expense/i18n/cs.po
index 0b4655e3f5d..b2a14da10f5 100644
--- a/addons/hr_expense/i18n/cs.po
+++ b/addons/hr_expense/i18n/cs.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/de.po b/addons/hr_expense/i18n/de.po
index 366b7abada1..2a09d155150 100644
--- a/addons/hr_expense/i18n/de.po
+++ b/addons/hr_expense/i18n/de.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/el.po b/addons/hr_expense/i18n/el.po
index fed172f1cc9..1c2b064f0b3 100644
--- a/addons/hr_expense/i18n/el.po
+++ b/addons/hr_expense/i18n/el.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/hr_expense/i18n/es.po b/addons/hr_expense/i18n/es.po
index ae8144d3c29..f9e0cacd0eb 100644
--- a/addons/hr_expense/i18n/es.po
+++ b/addons/hr_expense/i18n/es.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/es_AR.po b/addons/hr_expense/i18n/es_AR.po
index aae27748838..8bd237ffa07 100644
--- a/addons/hr_expense/i18n/es_AR.po
+++ b/addons/hr_expense/i18n/es_AR.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/es_EC.po b/addons/hr_expense/i18n/es_EC.po
index e3a1d061204..ac021661c34 100644
--- a/addons/hr_expense/i18n/es_EC.po
+++ b/addons/hr_expense/i18n/es_EC.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/et.po b/addons/hr_expense/i18n/et.po
index 63cd8b9d68d..0a9f5b196a3 100644
--- a/addons/hr_expense/i18n/et.po
+++ b/addons/hr_expense/i18n/et.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/fi.po b/addons/hr_expense/i18n/fi.po
index 1885b7de7a4..2b568773265 100644
--- a/addons/hr_expense/i18n/fi.po
+++ b/addons/hr_expense/i18n/fi.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/fr.po b/addons/hr_expense/i18n/fr.po
index 4ea72b6f876..9e3cfd2fae0 100644
--- a/addons/hr_expense/i18n/fr.po
+++ b/addons/hr_expense/i18n/fr.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/hr.po b/addons/hr_expense/i18n/hr.po
index 8707350e40d..71cd1adeb82 100644
--- a/addons/hr_expense/i18n/hr.po
+++ b/addons/hr_expense/i18n/hr.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
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_expense/i18n/hu.po b/addons/hr_expense/i18n/hu.po
index 0b4655e3f5d..b2a14da10f5 100644
--- a/addons/hr_expense/i18n/hu.po
+++ b/addons/hr_expense/i18n/hu.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/id.po b/addons/hr_expense/i18n/id.po
index 9caa83e307f..6ab57c7f257 100644
--- a/addons/hr_expense/i18n/id.po
+++ b/addons/hr_expense/i18n/id.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/it.po b/addons/hr_expense/i18n/it.po
index 6b629eed9ae..833d2d40cec 100644
--- a/addons/hr_expense/i18n/it.po
+++ b/addons/hr_expense/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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/ko.po b/addons/hr_expense/i18n/ko.po
index fe10ab82729..04444dff646 100644
--- a/addons/hr_expense/i18n/ko.po
+++ b/addons/hr_expense/i18n/ko.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/lt.po b/addons/hr_expense/i18n/lt.po
index 0b4655e3f5d..b2a14da10f5 100644
--- a/addons/hr_expense/i18n/lt.po
+++ b/addons/hr_expense/i18n/lt.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/lv.po b/addons/hr_expense/i18n/lv.po
index f2692a91d42..f8033ba582a 100644
--- a/addons/hr_expense/i18n/lv.po
+++ b/addons/hr_expense/i18n/lv.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/mn.po b/addons/hr_expense/i18n/mn.po
index 02da166d301..aa6f7f893fe 100644
--- a/addons/hr_expense/i18n/mn.po
+++ b/addons/hr_expense/i18n/mn.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/nl.po b/addons/hr_expense/i18n/nl.po
index 3ffe8cd32b4..74777eb5965 100644
--- a/addons/hr_expense/i18n/nl.po
+++ b/addons/hr_expense/i18n/nl.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/nl_BE.po b/addons/hr_expense/i18n/nl_BE.po
index 3570f05ea67..9e31c1118ff 100644
--- a/addons/hr_expense/i18n/nl_BE.po
+++ b/addons/hr_expense/i18n/nl_BE.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/pl.po b/addons/hr_expense/i18n/pl.po
index 108bd4f1867..1e6f0c88432 100644
--- a/addons/hr_expense/i18n/pl.po
+++ b/addons/hr_expense/i18n/pl.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/pt.po b/addons/hr_expense/i18n/pt.po
index ab63e71b4cd..e426a2450d7 100644
--- a/addons/hr_expense/i18n/pt.po
+++ b/addons/hr_expense/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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/pt_BR.po b/addons/hr_expense/i18n/pt_BR.po
index 201997e766a..21935ab20d3 100644
--- a/addons/hr_expense/i18n/pt_BR.po
+++ b/addons/hr_expense/i18n/pt_BR.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/ro.po b/addons/hr_expense/i18n/ro.po
index 04da2e27050..3f375d7ef84 100644
--- a/addons/hr_expense/i18n/ro.po
+++ b/addons/hr_expense/i18n/ro.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/ru.po b/addons/hr_expense/i18n/ru.po
index 9f2d8faa3c2..0b754eb22a1 100644
--- a/addons/hr_expense/i18n/ru.po
+++ b/addons/hr_expense/i18n/ru.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/sl.po b/addons/hr_expense/i18n/sl.po
index d4ceba9811f..889cb723674 100644
--- a/addons/hr_expense/i18n/sl.po
+++ b/addons/hr_expense/i18n/sl.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/sq.po b/addons/hr_expense/i18n/sq.po
index bc53bf99247..61344b5c8a8 100644
--- a/addons/hr_expense/i18n/sq.po
+++ b/addons/hr_expense/i18n/sq.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/sr.po b/addons/hr_expense/i18n/sr.po
index 4c0b123470d..4589e42274a 100644
--- a/addons/hr_expense/i18n/sr.po
+++ b/addons/hr_expense/i18n/sr.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/sr@latin.po b/addons/hr_expense/i18n/sr@latin.po
index a534d63878e..5f0362027e2 100644
--- a/addons/hr_expense/i18n/sr@latin.po
+++ b/addons/hr_expense/i18n/sr@latin.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/sv.po b/addons/hr_expense/i18n/sv.po
index 6c90d8071ff..478bd4f26a3 100644
--- a/addons/hr_expense/i18n/sv.po
+++ b/addons/hr_expense/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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/tlh.po b/addons/hr_expense/i18n/tlh.po
index d6cbd591237..78796639ddf 100644
--- a/addons/hr_expense/i18n/tlh.po
+++ b/addons/hr_expense/i18n/tlh.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/tr.po b/addons/hr_expense/i18n/tr.po
index ad89cf6dba9..2e9121d6464 100644
--- a/addons/hr_expense/i18n/tr.po
+++ b/addons/hr_expense/i18n/tr.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/uk.po b/addons/hr_expense/i18n/uk.po
index 4fe5ad8f279..58875b72df7 100644
--- a/addons/hr_expense/i18n/uk.po
+++ b/addons/hr_expense/i18n/uk.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/vi.po b/addons/hr_expense/i18n/vi.po
index 7dbfe9d4f58..4e3985fa665 100644
--- a/addons/hr_expense/i18n/vi.po
+++ b/addons/hr_expense/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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/zh_CN.po b/addons/hr_expense/i18n/zh_CN.po
index 4815457ec2c..f2ece250418 100644
--- a/addons/hr_expense/i18n/zh_CN.po
+++ b/addons/hr_expense/i18n/zh_CN.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/zh_TW.po b/addons/hr_expense/i18n/zh_TW.po
index 1b281f8c71a..ed6e75020c3 100644
--- a/addons/hr_expense/i18n/zh_TW.po
+++ b/addons/hr_expense/i18n/zh_TW.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 1d060aac499..5907c9ac797 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]
@@ -187,16 +179,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)
 
@@ -215,8 +203,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})
@@ -255,7 +241,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
@@ -270,8 +256,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)
         ids += self._get_category_leave_ids(cr, uid, ids)
         self._remove_resouce_leave(cr, uid, ids, context=context)
@@ -294,8 +278,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/ar.po b/addons/hr_holidays/i18n/ar.po
index 2fcb16fc2ce..a591628c06a 100644
--- a/addons/hr_holidays/i18n/ar.po
+++ b/addons/hr_holidays/i18n/ar.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-04 09:45+0000\n"
 "Last-Translator: <>\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-10-30 05:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -52,14 +52,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -80,9 +76,8 @@ msgid "Refused"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -96,7 +91,6 @@ msgid "Brown"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -118,11 +112,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -201,12 +190,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -219,6 +221,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -396,6 +399,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -404,8 +412,9 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -414,13 +423,13 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:available.holidays.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_holidays
@@ -445,6 +454,19 @@ msgstr ""
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -554,11 +576,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -569,29 +586,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -647,6 +641,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -682,7 +677,8 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -691,20 +687,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -741,6 +723,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -776,12 +767,6 @@ msgstr ""
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -792,11 +777,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -804,14 +784,14 @@ msgid "Print"
 msgstr ""
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -836,6 +816,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -946,11 +927,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -967,12 +943,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
diff --git a/addons/hr_holidays/i18n/bg.po b/addons/hr_holidays/i18n/bg.po
index 518677e734e..25ef11dedc1 100644
--- a/addons/hr_holidays/i18n/bg.po
+++ b/addons/hr_holidays/i18n/bg.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-09 13:37+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-10-30 05:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -52,14 +52,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -80,9 +76,8 @@ msgid "Refused"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -96,7 +91,6 @@ msgid "Brown"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -118,11 +112,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -201,12 +190,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -219,6 +221,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -396,6 +399,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -404,8 +412,9 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -414,14 +423,14 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
+#: selection:available.holidays.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -445,6 +454,19 @@ msgstr ""
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -554,11 +576,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -569,29 +586,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -647,6 +641,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -682,7 +677,8 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -691,20 +687,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -741,6 +723,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -776,14 +767,6 @@ msgstr ""
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-"символи!"
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -794,11 +777,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -806,14 +784,14 @@ msgid "Print"
 msgstr ""
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -838,6 +816,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -948,11 +927,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -969,12 +943,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
@@ -1011,3 +979,12 @@ msgstr ""
 
 #~ msgid "Validate"
 #~ msgstr "Проверка"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Невалиден XML за преглед на архитектурата"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
+#~ "символи!"
diff --git a/addons/hr_holidays/i18n/bs.po b/addons/hr_holidays/i18n/bs.po
index 20466fd19b5..f5b3220d267 100644
--- a/addons/hr_holidays/i18n/bs.po
+++ b/addons/hr_holidays/i18n/bs.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-09 13:37+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-10-30 05:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -52,14 +52,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -80,9 +76,8 @@ msgid "Refused"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -96,7 +91,6 @@ msgid "Brown"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -118,11 +112,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -201,12 +190,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -219,6 +221,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -396,6 +399,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -404,8 +412,9 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -414,14 +423,14 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+#: selection:available.holidays.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -445,6 +454,19 @@ msgstr ""
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -554,11 +576,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -569,29 +586,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -647,6 +641,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -682,7 +677,8 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -691,20 +687,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -741,6 +723,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -776,12 +767,6 @@ msgstr ""
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -792,11 +777,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -804,14 +784,14 @@ msgid "Print"
 msgstr ""
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -836,6 +816,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -946,11 +927,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -967,12 +943,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
@@ -1006,3 +976,6 @@ msgstr ""
 msgid ""
 "You Cannot Validate leaves while available leaves are less than asked leaves."
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
diff --git a/addons/hr_holidays/i18n/ca.po b/addons/hr_holidays/i18n/ca.po
index 182166a0449..5917f2a4d91 100644
--- a/addons/hr_holidays/i18n/ca.po
+++ b/addons/hr_holidays/i18n/ca.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 10:24+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-10-31 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -52,14 +52,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -80,9 +76,8 @@ msgid "Refused"
 msgstr "Rebutjada"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -96,7 +91,6 @@ msgid "Brown"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -118,11 +112,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -201,12 +190,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr "Atenció!"
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -219,6 +221,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -396,6 +399,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -404,8 +412,9 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -414,14 +423,14 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
+#: selection:available.holidays.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -445,6 +454,19 @@ msgstr ""
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -554,11 +576,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -569,29 +586,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -647,6 +641,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -682,7 +677,8 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -691,20 +687,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -741,6 +723,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -776,14 +767,6 @@ msgstr ""
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-"especial!"
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -794,11 +777,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -806,14 +784,14 @@ msgid "Print"
 msgstr ""
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -838,6 +816,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -948,11 +927,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -969,12 +943,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
@@ -1009,5 +977,14 @@ msgid ""
 "You Cannot Validate leaves while available leaves are less than asked leaves."
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invàlid per a la definició de la vista!"
+
 #~ msgid "Validate"
 #~ msgstr "Valida"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+#~ "especial!"
diff --git a/addons/hr_holidays/i18n/cs.po b/addons/hr_holidays/i18n/cs.po
index 24018517774..efdd8df8afa 100644
--- a/addons/hr_holidays/i18n/cs.po
+++ b/addons/hr_holidays/i18n/cs.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-04 09:44+0000\n"
 "Last-Translator: <>\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-10-30 05:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -52,14 +52,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -80,9 +76,8 @@ msgid "Refused"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -96,7 +91,6 @@ msgid "Brown"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -118,11 +112,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -201,12 +190,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -219,6 +221,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -396,6 +399,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -404,8 +412,9 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -414,13 +423,13 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:available.holidays.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_holidays
@@ -445,6 +454,19 @@ msgstr ""
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -554,11 +576,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -569,29 +586,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -647,6 +641,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -682,7 +677,8 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -691,20 +687,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -741,6 +723,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -776,12 +767,6 @@ msgstr ""
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -792,11 +777,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -804,14 +784,14 @@ msgid "Print"
 msgstr ""
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -836,6 +816,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -946,11 +927,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -967,12 +943,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
diff --git a/addons/hr_holidays/i18n/de.po b/addons/hr_holidays/i18n/de.po
index 48d61b8ea48..a09e854d206 100644
--- a/addons/hr_holidays/i18n/de.po
+++ b/addons/hr_holidays/i18n/de.po
@@ -6,7 +6,7 @@ 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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-30 16:05+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -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-01 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -50,24 +50,6 @@ msgstr "Urlaubsanspruch - Bereits beanspr. Urlaub"
 msgid "Leaves Management"
 msgstr "Urlaubsmanagement"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = obj_hr_holiday_status.get_days_cat( cr, "
-"uid, [record.holiday_status_id.id], record.category_id.id, "
-"False)[record.holiday_status_id.id]['remaining_leaves']\n"
-"                    if leaves_rest < leave_asked:\n"
-"                        raise osv.except_osv(_('Warning!"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
@@ -75,11 +57,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Gruppierung..."
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -230,6 +207,14 @@ msgstr "Genehmigung"
 msgid "Warning !"
 msgstr "Warnung"
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -449,11 +434,6 @@ msgstr "Rot"
 msgid "Leaves by Type"
 msgstr "Abwesenheit nach Typ"
 
-#. module: hr_holidays
-#: 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 !"
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Salmon"
@@ -464,6 +444,11 @@ msgstr "Hell Rosa"
 msgid "Wheat"
 msgstr "Weiss"
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -492,11 +477,6 @@ msgstr "Suche Abwesenheitstyp"
 msgid "July"
 msgstr "Juli"
 
-#. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -526,6 +506,14 @@ msgstr " Monat "
 msgid "Leaves By Month"
 msgstr "Abwesenheit nach Monaten"
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -642,11 +630,6 @@ msgstr "Urlaub nach Abteilungen"
 msgid "Black"
 msgstr "Schwarz"
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können rekursiven Menüs erstellen."
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -657,46 +640,6 @@ msgstr "Urlaub"
 msgid "Maximum Leaves Allowed"
 msgstr "Maximale Urlaubstage"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-"Sie können keine %s Tage genehmigen, wenn der verfügbare Rest kleiner als "
-"die beantragte Anzahl an Tagen ist.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -817,11 +760,6 @@ msgstr ""
 msgid "Request Type"
 msgstr "Anfragetyp"
 
-#. module: hr_holidays
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: hr_holidays
 #: help:hr.holidays.status,active:0
 msgid ""
@@ -864,13 +802,6 @@ msgstr ""
 msgid "Leaves Analysis"
 msgstr "Analyse Abwesenheit"
 
-#. module: hr_holidays
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-"Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-"vorhanden sein !"
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: view:hr.holidays.summary.dept:0
@@ -897,25 +828,12 @@ msgstr ""
 msgid "Validated"
 msgstr "Bestätigt"
 
-#. module: hr_holidays
-#: 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 !"
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr "Urlaubsanspruch"
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -1084,11 +1002,6 @@ msgstr "Genehmige"
 msgid "Linked Requests"
 msgstr "Verbundene Anfragen"
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -1231,6 +1144,9 @@ msgstr ""
 #~ msgid "Holiday Status"
 #~ msgstr "Urlaubsstatus"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "If holidays available, employee can take it and fill it."
 #~ msgstr "Bei verfügbarem freien Urlaub kann Mitarbeiter diesen abfeiern."
 
@@ -1316,6 +1232,12 @@ msgstr ""
 #~ msgid "My Holidays Request Refused"
 #~ msgstr "Meine Urlaubsanfragen (abgelehnt)"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "Print Summary of Holidays"
 #~ msgstr "Drucke alle Urlaubszeiten"
 
@@ -1431,9 +1353,53 @@ msgstr ""
 #~ "Benutzer der Gruppe Personal/HR und der Rolle Urlaube/holidays können den "
 #~ "Status definieren.\n"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
 #~ msgid "Leave Days"
 #~ msgstr "Urlaubstage"
 
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können rekursiven Menüs erstellen."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot validate leaves for %s while available leaves are less than asked "
+#~ "leaves.' %(record.category_id.name)))\n"
+#~ "                nb = -(record.number_of_days_temp)\n"
+#~ "            else:\n"
+#~ "                nb = record.number_of_days_temp\n"
+#~ "\n"
+#~ "            if record.holiday_type == 'employee' and record.employee_id:\n"
+#~ "                user_id = record.employee_id.user_id and "
+#~ "record.employee_id.user_id.id or uid\n"
+#~ "\n"
+#~ "            self.write(cr, uid, [record.id], {'state':'confirm', "
+#~ "'number_of_days': nb, 'user_id': user_id })\n"
+#~ "        return True\n"
+#~ "\n"
+#~ "    def holidays_refuse(self, cr, uid, ids, *args):\n"
+#~ "        vals = {'state': 'refuse'}\n"
+#~ "        ids2 = self.pool.get('hr.employee"
+#~ msgstr ""
+#~ "Sie können keine %s Tage genehmigen, wenn der verfügbare Rest kleiner als "
+#~ "die beantragte Anzahl an Tagen ist.' %(record.category_id.name)))\n"
+#~ "                nb = -(record.number_of_days_temp)\n"
+#~ "            else:\n"
+#~ "                nb = record.number_of_days_temp\n"
+#~ "\n"
+#~ "            if record.holiday_type == 'employee' and record.employee_id:\n"
+#~ "                user_id = record.employee_id.user_id and "
+#~ "record.employee_id.user_id.id or uid\n"
+#~ "\n"
+#~ "            self.write(cr, uid, [record.id], {'state':'confirm', "
+#~ "'number_of_days': nb, 'user_id': user_id })\n"
+#~ "        return True\n"
+#~ "\n"
+#~ "    def holidays_refuse(self, cr, uid, ids, *args):\n"
+#~ "        vals = {'state': 'refuse'}\n"
+#~ "        ids2 = self.pool.get('hr.employee"
+
 #~ msgid "Extended options..."
 #~ msgstr "Erweiterte Optionen.."
 
@@ -1462,3 +1428,20 @@ msgstr ""
 
 #~ msgid "My Leaves by Type"
 #~ msgstr "Abwesenheit nach Typ"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr ""
+#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
+#~ "vorhanden 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 !"
diff --git a/addons/hr_holidays/i18n/el.po b/addons/hr_holidays/i18n/el.po
index 97c246da116..4c08a45a186 100644
--- a/addons/hr_holidays/i18n/el.po
+++ b/addons/hr_holidays/i18n/el.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 11:52+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-10-31 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -55,14 +55,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -83,9 +79,8 @@ msgid "Refused"
 msgstr "Απορριφθείσα"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -99,7 +94,6 @@ msgid "Brown"
 msgstr "Καφέ"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -121,11 +115,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -204,12 +193,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr "Προσοχή!"
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -222,6 +224,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -399,6 +402,11 @@ msgstr "Ανοικτό Σομόν"
 msgid "Wheat"
 msgstr "Σιταρένιο"
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -407,8 +415,9 @@ msgid "Number of Days"
 msgstr "Ημέρες"
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -417,14 +426,14 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
+#: selection:available.holidays.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -448,6 +457,19 @@ msgstr "Υπάλληλος/οι"
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -557,11 +579,6 @@ msgstr ""
 msgid "Black"
 msgstr "Μαύρο"
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -572,29 +589,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr "Ανώτατο όριο αδειών"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -650,6 +644,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -685,7 +680,8 @@ msgstr "Ημερ/νία"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -694,20 +690,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -744,6 +726,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -779,13 +770,6 @@ msgstr "Επικυρωμένη"
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες"
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -796,11 +780,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -808,14 +787,14 @@ msgid "Print"
 msgstr "Εκτύπωση"
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -840,6 +819,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -950,11 +930,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -971,12 +946,6 @@ msgstr "Κίτρινο"
 msgid "Light Pink"
 msgstr "Ροζ"
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
@@ -1113,6 +1082,9 @@ msgstr ""
 #~ msgid "Report Options"
 #~ msgstr "Επιλογές Αναφοράς"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
+
 #~ msgid "His manager approves the request"
 #~ msgstr "Ο Προϊστάμενος εγκρίνει την αίτηση"
 
@@ -1230,6 +1202,11 @@ msgstr ""
 #~ msgid "My Holidays Request Refused"
 #~ msgstr "Αιτήσεις Αδείας μου Απορριφθείσες"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες"
+
 #~ msgid "Print Summary of Holidays"
 #~ msgstr "Εκτύπωση Αδειών Συνοπτικά"
 
@@ -1266,6 +1243,9 @@ msgstr ""
 #~ msgid "Holiday per user"
 #~ msgstr "Άδειες ανα χρήστη"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
+
 #~ msgid ""
 #~ "Human Ressources: Holidays tracking and workflow\n"
 #~ "\n"
diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index 28686550376..67e3899a287 100644
--- a/addons/hr_holidays/i18n/es.po
+++ b/addons/hr_holidays/i18n/es.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-12-05 10:18+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\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-09 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/es_AR.po b/addons/hr_holidays/i18n/es_AR.po
index 692ff5933b0..86543bd7ee7 100644
--- a/addons/hr_holidays/i18n/es_AR.po
+++ b/addons/hr_holidays/i18n/es_AR.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-22 19:19+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\n"
 "Language-Team: Spanish (Argentina) <es_AR@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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -53,14 +53,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -81,9 +77,8 @@ msgid "Refused"
 msgstr "Rechazado"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -97,7 +92,6 @@ msgid "Brown"
 msgstr "Marrón"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -119,11 +113,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -202,12 +191,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr "¡Aviso!"
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -220,6 +222,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -397,6 +400,11 @@ msgstr "Salmón claro"
 msgid "Wheat"
 msgstr "Trigo"
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -405,8 +413,9 @@ msgid "Number of Days"
 msgstr "Cantidad de días"
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -415,14 +424,14 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista!"
+#: selection:available.holidays.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -446,6 +455,19 @@ msgstr "Empelado(s)"
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -555,11 +577,6 @@ msgstr ""
 msgid "Black"
 msgstr "Negro"
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -570,29 +587,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr "Máximo de licencias permitidas"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -648,6 +642,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -683,7 +678,8 @@ msgstr "Fecha"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -692,20 +688,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -742,6 +724,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -777,14 +768,6 @@ msgstr "Validado"
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
-"especial!"
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -795,11 +778,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -807,14 +785,14 @@ msgid "Print"
 msgstr "Imprimir"
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -839,6 +817,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -949,11 +928,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -970,12 +944,6 @@ msgstr "Amarillo claro"
 msgid "Light Pink"
 msgstr "Rosa claro"
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
diff --git a/addons/hr_holidays/i18n/es_EC.po b/addons/hr_holidays/i18n/es_EC.po
index cf89d2008d4..4845f3ace10 100644
--- a/addons/hr_holidays/i18n/es_EC.po
+++ b/addons/hr_holidays/i18n/es_EC.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-19 00:02+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -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-10-30 05:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -53,14 +53,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de la acción"
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -81,9 +77,8 @@ msgid "Refused"
 msgstr "Rechazado"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -97,7 +92,6 @@ msgid "Brown"
 msgstr "Marrón"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -119,11 +113,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -202,12 +191,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr "¡Atención!"
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -220,6 +222,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -397,6 +400,11 @@ msgstr "Salmón claro"
 msgid "Wheat"
 msgstr "Trigo"
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -405,8 +413,9 @@ msgid "Number of Days"
 msgstr "Número de días"
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -415,14 +424,14 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+#: selection:available.holidays.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -446,6 +455,19 @@ msgstr "Empleado(s)"
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -555,11 +577,6 @@ msgstr ""
 msgid "Black"
 msgstr "Negro"
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -570,29 +587,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr "Máximo de vacaciones permitidas"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -648,6 +642,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -683,7 +678,8 @@ msgstr "Fecha"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -692,20 +688,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -742,6 +724,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -777,14 +768,6 @@ msgstr "Validado"
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -795,11 +778,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -807,14 +785,14 @@ msgid "Print"
 msgstr "Imprimir"
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -839,6 +817,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -949,11 +928,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -970,12 +944,6 @@ msgstr "Amarillo claro"
 msgid "Light Pink"
 msgstr "Rosa claro"
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
diff --git a/addons/hr_holidays/i18n/et.po b/addons/hr_holidays/i18n/et.po
index 497dca71720..05588f3bec0 100644
--- a/addons/hr_holidays/i18n/et.po
+++ b/addons/hr_holidays/i18n/et.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 11: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-10-31 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -52,14 +52,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -80,9 +76,8 @@ msgid "Refused"
 msgstr "Tagasi lükatud"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -96,7 +91,6 @@ msgid "Brown"
 msgstr "Pruun"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -118,11 +112,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -201,12 +190,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr "Hoiatus!"
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -219,6 +221,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -396,6 +399,11 @@ msgstr "Helekollane"
 msgid "Wheat"
 msgstr "Nisukarva"
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -404,8 +412,9 @@ msgid "Number of Days"
 msgstr "Päevade arv"
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -414,14 +423,14 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
+#: selection:available.holidays.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -445,6 +454,19 @@ msgstr "Töötaja(d)"
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -554,11 +576,6 @@ msgstr ""
 msgid "Black"
 msgstr "Must"
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -569,29 +586,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr "Maks. lubatud puhkusepäevi"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -647,6 +641,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -682,7 +677,8 @@ msgstr "Kuupäev"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -691,20 +687,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -741,6 +723,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -776,13 +767,6 @@ msgstr "Kinnitatud"
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: 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: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -793,11 +777,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -805,14 +784,14 @@ msgid "Print"
 msgstr "Prindi"
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -837,6 +816,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -947,11 +927,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -968,12 +943,6 @@ msgstr "Helekollane"
 msgid "Light Pink"
 msgstr "Heleroosa"
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
@@ -1062,6 +1031,11 @@ msgstr ""
 #~ msgid "Document for employee"
 #~ msgstr "Dokument töötajale"
 
+#~ 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 "Refused Request"
 #~ msgstr "Tagasilükatud palved"
 
@@ -1224,6 +1198,12 @@ msgstr ""
 #~ msgid "of the"
 #~ msgstr "."
 
+#~ 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 "Ok"
 #~ msgstr "Ok"
 
diff --git a/addons/hr_holidays/i18n/fi.po b/addons/hr_holidays/i18n/fi.po
index 7eecb87693a..45c9e334b68 100644
--- a/addons/hr_holidays/i18n/fi.po
+++ b/addons/hr_holidays/i18n/fi.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 16:14+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@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-31 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -53,14 +53,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -81,9 +77,8 @@ msgid "Refused"
 msgstr "Hylätty"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -97,7 +92,6 @@ msgid "Brown"
 msgstr "Ruskea"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -119,11 +113,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -202,12 +191,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -220,6 +222,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -397,6 +400,11 @@ msgstr "Kirkas lohenpunainen"
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -405,8 +413,9 @@ msgid "Number of Days"
 msgstr "Päivien lukumäärä"
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -415,14 +424,14 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
+#: selection:available.holidays.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -446,6 +455,19 @@ msgstr "Työntekijä(t)"
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -555,11 +577,6 @@ msgstr ""
 msgid "Black"
 msgstr "Musta"
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -570,29 +587,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr "Sallittujen lomapäivien enimmäismäärä"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -648,6 +642,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -683,7 +678,8 @@ msgstr "Päivämäärä"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -692,20 +688,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -742,6 +724,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -777,12 +768,6 @@ msgstr "Vahvistettu"
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -793,11 +778,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -805,14 +785,14 @@ msgid "Print"
 msgstr "Tulosta"
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -837,6 +817,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -947,11 +928,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -968,12 +944,6 @@ msgstr "Kirkas Keltainen"
 msgid "Light Pink"
 msgstr "Kirkas Vaaleanpunainen"
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
@@ -1268,6 +1238,9 @@ msgstr ""
 #~ msgid "My Holidays Request Validated"
 #~ msgstr "Omat vahvistetut loma-anomukset"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
+
 #~ msgid "Ok"
 #~ msgstr "Ok"
 
@@ -1283,6 +1256,9 @@ msgstr ""
 #~ msgid "Notification"
 #~ msgstr "Huomautus"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
+
 #~ msgid "Status"
 #~ msgstr "Tila"
 
@@ -1297,3 +1273,7 @@ msgstr ""
 
 #~ msgid "draft"
 #~ msgstr "luonnos"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
diff --git a/addons/hr_holidays/i18n/fr.po b/addons/hr_holidays/i18n/fr.po
index 26f603b78e5..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-05 04:52+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/hi.po b/addons/hr_holidays/i18n/hi.po
index a54b655f327..08ccbf0686e 100644
--- a/addons/hr_holidays/i18n/hi.po
+++ b/addons/hr_holidays/i18n/hi.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 15:13+0000\n"
 "Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
 "Language-Team: Hindi <hi@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-31 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -53,14 +53,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "कार्य की परिभाषा में मॉडल का नाम अमान्य है."
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -81,9 +77,8 @@ msgid "Refused"
 msgstr "मना कर दिया"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -97,7 +92,6 @@ msgid "Brown"
 msgstr "भूरा"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -119,11 +113,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -202,12 +191,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -220,6 +222,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -397,6 +400,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -405,8 +413,9 @@ msgid "Number of Days"
 msgstr "दिनों की संख्या"
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -415,14 +424,14 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "संरचना देखने के लिए अमान्य XML!"
+#: selection:available.holidays.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -446,6 +455,19 @@ msgstr "कर्मचारी"
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -555,11 +577,6 @@ msgstr ""
 msgid "Black"
 msgstr "काला"
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -570,29 +587,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr "अधिकतम छुट्टियां  की अनुमति"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -648,6 +642,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -683,7 +678,8 @@ msgstr "तारीख़"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -692,20 +688,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -742,6 +724,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -777,12 +768,6 @@ msgstr ""
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -793,11 +778,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -805,14 +785,14 @@ msgid "Print"
 msgstr "प्रिंट"
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -837,6 +817,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -947,11 +928,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -968,12 +944,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
@@ -1014,6 +984,9 @@ msgstr ""
 #~ msgid "All Holidays Requests"
 #~ msgstr "सभी छुट्टी अनुरोध"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "कार्य की परिभाषा में मॉडल का नाम अमान्य है."
+
 #~ msgid "New Holidays Request"
 #~ msgstr "नया छुट्टी के लिए अनुरोध"
 
@@ -1071,6 +1044,9 @@ msgstr ""
 #~ msgid "Encoding of annual available holidays."
 #~ msgstr "वार्षिक उपलब्ध छुट्टियों की एनकोडिंग"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "संरचना देखने के लिए अमान्य XML!"
+
 #~ msgid "You have to select at least 1 Employee. Try again."
 #~ msgstr "आप कम से कम 1 कर्मचारी चयन करे. दुबारा कोशिश करें."
 
diff --git a/addons/hr_holidays/i18n/hr.po b/addons/hr_holidays/i18n/hr.po
index 3ea2ff82860..f7d645b6411 100644
--- a/addons/hr_holidays/i18n/hr.po
+++ b/addons/hr_holidays/i18n/hr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 11:47+0000\n"
 "Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@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-10-31 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -52,14 +52,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Pogrešno ime modela u definiciji akcije."
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -80,9 +76,8 @@ msgid "Refused"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -96,7 +91,6 @@ msgid "Brown"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -118,11 +112,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -201,12 +190,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -219,6 +221,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -396,6 +399,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -404,8 +412,9 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -414,14 +423,14 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za Arhitekturu Prikaza!"
+#: selection:available.holidays.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -445,6 +454,19 @@ msgstr ""
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -554,11 +576,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -569,29 +586,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -647,6 +641,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -682,7 +677,8 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -691,20 +687,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -741,6 +723,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -776,12 +767,6 @@ msgstr ""
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -792,11 +777,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -804,14 +784,14 @@ msgid "Print"
 msgstr ""
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -836,6 +816,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -946,11 +927,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -967,12 +943,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
@@ -1007,6 +977,9 @@ msgid ""
 "You Cannot Validate leaves while available leaves are less than asked leaves."
 msgstr ""
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Pogrešno ime modela u definiciji akcije."
+
 #~ msgid "Requests Awaiting for Validation"
 #~ msgstr "Neodobreni zahtjevi"
 
@@ -1069,3 +1042,6 @@ msgstr ""
 
 #~ msgid "Define holiday status"
 #~ msgstr "Definicija statusa GO"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nevažeći XML za Arhitekturu Prikaza!"
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/i18n/hu.po b/addons/hr_holidays/i18n/hu.po
index 70722c7c5d4..f6df3de13b9 100644
--- a/addons/hr_holidays/i18n/hu.po
+++ b/addons/hr_holidays/i18n/hu.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-04 09:43+0000\n"
 "Last-Translator: <>\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-10-30 05:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -52,14 +52,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -80,9 +76,8 @@ msgid "Refused"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -96,7 +91,6 @@ msgid "Brown"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -118,11 +112,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -201,12 +190,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -219,6 +221,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -396,6 +399,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -404,8 +412,9 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -414,13 +423,13 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:available.holidays.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_holidays
@@ -445,6 +454,19 @@ msgstr ""
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -554,11 +576,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -569,29 +586,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -647,6 +641,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -682,7 +677,8 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -691,20 +687,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -741,6 +723,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -776,12 +767,6 @@ msgstr ""
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -792,11 +777,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -804,14 +784,14 @@ msgid "Print"
 msgstr ""
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -836,6 +816,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -946,11 +927,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -967,12 +943,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
diff --git a/addons/hr_holidays/i18n/id.po b/addons/hr_holidays/i18n/id.po
index 0eb1d21414b..2e6b1c22c54 100644
--- a/addons/hr_holidays/i18n/id.po
+++ b/addons/hr_holidays/i18n/id.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 10: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-10-31 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -52,14 +52,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nama model tidak sah di definsi aksi"
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -80,9 +76,8 @@ msgid "Refused"
 msgstr "Ditolak"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -96,7 +91,6 @@ msgid "Brown"
 msgstr "Coklat"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -118,11 +112,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -201,12 +190,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -219,6 +221,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -396,6 +399,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -404,8 +412,9 @@ msgid "Number of Days"
 msgstr "Jumlah Hari"
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -414,14 +423,14 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML tidak sah untuk Menampilkan Arsitektur!"
+#: selection:available.holidays.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -445,6 +454,19 @@ msgstr "Karyawan"
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -554,11 +576,6 @@ msgstr ""
 msgid "Black"
 msgstr "Hitam"
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -569,29 +586,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -647,6 +641,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -682,7 +677,8 @@ msgstr "Tanggal"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -691,20 +687,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -741,6 +723,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -776,13 +767,6 @@ msgstr ""
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Nama Objek harus berawalan dengan x_ dan tidak mengandung karakter khusus !"
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -793,11 +777,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -805,14 +784,14 @@ msgid "Print"
 msgstr "Cetak"
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -837,6 +816,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -947,11 +927,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -968,12 +943,6 @@ msgstr "Kuning Cerah"
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
@@ -1008,6 +977,9 @@ msgid ""
 "You Cannot Validate leaves while available leaves are less than asked leaves."
 msgstr ""
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nama model tidak sah di definsi aksi"
+
 #~ msgid "Both"
 #~ msgstr "Keduanya"
 
@@ -1017,6 +989,9 @@ msgstr ""
 #~ msgid "Notes"
 #~ msgstr "Catatan"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML tidak sah untuk Menampilkan Arsitektur!"
+
 #~ msgid "Report Options"
 #~ msgstr "Pilihan Laporan"
 
@@ -1047,6 +1022,11 @@ msgstr ""
 #~ msgid "Document for employee"
 #~ msgstr "Dokumen untuk karyawan"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Nama Objek harus berawalan dengan x_ dan tidak mengandung karakter khusus !"
+
 #~ msgid "Holiday per user"
 #~ msgstr "Hari libur per pengguna"
 
diff --git a/addons/hr_holidays/i18n/it.po b/addons/hr_holidays/i18n/it.po
index 23028b78b28..d3c2e568287 100644
--- a/addons/hr_holidays/i18n/it.po
+++ b/addons/hr_holidays/i18n/it.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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-12-01 08:42+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-02 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -49,24 +49,6 @@ msgstr "Massimi permessi maturati - Permessi già fruiti"
 msgid "Leaves Management"
 msgstr "Gestione permessi"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = obj_hr_holiday_status.get_days_cat( cr, "
-"uid, [record.holiday_status_id.id], record.category_id.id, "
-"False)[record.holiday_status_id.id]['remaining_leaves']\n"
-"                    if leaves_rest < leave_asked:\n"
-"                        raise osv.except_osv(_('Warning!"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
@@ -74,11 +56,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Raggruppa per..."
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome modello non valido nella definizione dell'azione."
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -224,6 +201,14 @@ msgstr ""
 msgid "Warning !"
 msgstr "Attenzione !"
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -408,11 +393,6 @@ msgstr "Rosso"
 msgid "Leaves by Type"
 msgstr "Permessi per tipo"
 
-#. module: hr_holidays
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Salmon"
@@ -423,6 +403,11 @@ msgstr "Salmone Chiaro"
 msgid "Wheat"
 msgstr "Beige"
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -451,11 +436,6 @@ msgstr ""
 msgid "July"
 msgstr "Luglio"
 
-#. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -483,6 +463,14 @@ msgstr " Mese "
 msgid "Leaves By Month"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -592,11 +580,6 @@ msgstr "Ferie per dipartimento"
 msgid "Black"
 msgstr "Nero"
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -607,29 +590,6 @@ msgstr "Ferie"
 msgid "Maximum Leaves Allowed"
 msgstr "Permessi massimi maturati"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -750,11 +710,6 @@ msgstr ""
 msgid "Request Type"
 msgstr "Tipo di richiesta"
 
-#. module: hr_holidays
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,active:0
 msgid ""
@@ -791,11 +746,6 @@ msgstr ""
 msgid "Leaves Analysis"
 msgstr "Analisi permessi"
 
-#. module: hr_holidays
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: view:hr.holidays.summary.dept:0
@@ -819,25 +769,12 @@ msgstr ""
 msgid "Validated"
 msgstr "Convalidata"
 
-#. module: hr_holidays
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -998,11 +935,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -1059,6 +991,9 @@ msgstr ""
 #~ msgid "Section"
 #~ msgstr "Sezione"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per Visualizzazione Architettura!"
+
 #~ msgid "Requests Awaiting for Validation"
 #~ msgstr "Richieste in attesa di validazione"
 
@@ -1200,9 +1135,18 @@ msgstr ""
 #~ msgid "Holidays Process"
 #~ msgstr "Processo di ferie"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
+
 #~ msgid "of the"
 #~ msgstr "del/dei"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome modello non valido nella definizione dell'azione."
+
 #~ msgid "Employee Holidays"
 #~ msgstr "Ferie del dipentente"
 
@@ -1362,6 +1306,9 @@ msgstr ""
 #~ msgid "Leave Days"
 #~ msgstr "Giorni Rimanenti"
 
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
+
 #~ msgid "Extended options..."
 #~ msgstr "Opzioni estese..."
 
diff --git a/addons/hr_holidays/i18n/ko.po b/addons/hr_holidays/i18n/ko.po
index 7ac5c9bd94c..817d952b1e5 100644
--- a/addons/hr_holidays/i18n/ko.po
+++ b/addons/hr_holidays/i18n/ko.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 08:43+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-10-31 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -53,14 +53,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -81,9 +77,8 @@ msgid "Refused"
 msgstr "거부됨"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -97,7 +92,6 @@ msgid "Brown"
 msgstr "갈색"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -119,11 +113,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -202,12 +191,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr "경고 !"
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -220,6 +222,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -397,6 +400,11 @@ msgstr ""
 msgid "Wheat"
 msgstr "밀"
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -405,8 +413,9 @@ msgid "Number of Days"
 msgstr "일 수"
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -415,13 +424,13 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:available.holidays.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_holidays
@@ -446,6 +455,19 @@ msgstr "직원(들)"
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -555,11 +577,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -570,29 +587,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr "허용된 최대 휴무"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -648,6 +642,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -683,7 +678,8 @@ msgstr "날짜"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -692,20 +688,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -742,6 +724,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -777,12 +768,6 @@ msgstr "검증됨"
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -793,11 +778,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -805,14 +785,14 @@ msgid "Print"
 msgstr "인쇄"
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -837,6 +817,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -947,11 +928,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -968,12 +944,6 @@ msgstr "밝은 노랑"
 msgid "Light Pink"
 msgstr "밝은 핑크"
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
diff --git a/addons/hr_holidays/i18n/lt.po b/addons/hr_holidays/i18n/lt.po
index 488a6674b59..1755d55094d 100644
--- a/addons/hr_holidays/i18n/lt.po
+++ b/addons/hr_holidays/i18n/lt.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 14: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-10-31 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -52,14 +52,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -80,9 +76,8 @@ msgid "Refused"
 msgstr "Atmestos"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -96,7 +91,6 @@ msgid "Brown"
 msgstr "Ruda"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -118,11 +112,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -201,12 +190,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -219,6 +221,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -396,6 +399,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -404,8 +412,9 @@ msgid "Number of Days"
 msgstr "Dienų skaičius"
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -414,13 +423,13 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:available.holidays.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_holidays
@@ -445,6 +454,19 @@ msgstr "Darbuotojas(-ai)"
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -554,11 +576,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -569,29 +586,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -647,6 +641,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -682,7 +677,8 @@ msgstr "Data"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -691,20 +687,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -741,6 +723,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -776,12 +767,6 @@ msgstr "Patvirtintos"
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -792,11 +777,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -804,14 +784,14 @@ msgid "Print"
 msgstr "Spausdinti"
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -836,6 +816,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -946,11 +927,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -967,12 +943,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
diff --git a/addons/hr_holidays/i18n/lv.po b/addons/hr_holidays/i18n/lv.po
index a60b16ee765..0b8fea2eaec 100644
--- a/addons/hr_holidays/i18n/lv.po
+++ b/addons/hr_holidays/i18n/lv.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-10-22 14:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -53,14 +53,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -81,9 +77,8 @@ msgid "Refused"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -97,7 +92,6 @@ msgid "Brown"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -119,11 +113,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -202,12 +191,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -220,6 +222,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -397,6 +400,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -405,8 +413,9 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -415,13 +424,13 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:available.holidays.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_holidays
@@ -446,6 +455,19 @@ msgstr ""
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -555,11 +577,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -570,29 +587,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -648,6 +642,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -683,7 +678,8 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -692,20 +688,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -742,6 +724,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -777,12 +768,6 @@ msgstr ""
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -793,11 +778,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -805,14 +785,14 @@ msgid "Print"
 msgstr ""
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -837,6 +817,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -947,11 +928,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -968,12 +944,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
diff --git a/addons/hr_holidays/i18n/mn.po b/addons/hr_holidays/i18n/mn.po
index 954d6a6840b..c6aac3f5f87 100644
--- a/addons/hr_holidays/i18n/mn.po
+++ b/addons/hr_holidays/i18n/mn.po
@@ -6,14 +6,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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-25 19:27+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-26 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -49,24 +49,6 @@ msgstr "Зөвшөөрсөн амралт, чөлөөний дээд хэмжэ
 msgid "Leaves Management"
 msgstr "Амралт, чөлөөний удирдлага"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = obj_hr_holiday_status.get_days_cat( cr, "
-"uid, [record.holiday_status_id.id], record.category_id.id, "
-"False)[record.holiday_status_id.id]['remaining_leaves']\n"
-"                    if leaves_rest < leave_asked:\n"
-"                        raise osv.except_osv(_('Warning!"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
@@ -74,11 +56,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Бүлэглэх..."
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -229,6 +206,14 @@ msgstr ""
 msgid "Warning !"
 msgstr "Сануулга !"
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -426,11 +411,6 @@ msgstr "Улаан"
 msgid "Leaves by Type"
 msgstr "Төрлөөр ангилсан амралт, чөлөө"
 
-#. module: hr_holidays
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Salmon"
@@ -441,6 +421,11 @@ msgstr "Цайвар улбар шар"
 msgid "Wheat"
 msgstr "Үр тарианы өнгө"
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -469,11 +454,6 @@ msgstr ""
 msgid "July"
 msgstr "7 сар"
 
-#. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Дэлгэцийн архитектур алдаатай!"
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -503,6 +483,14 @@ msgstr " Сар "
 msgid "Leaves By Month"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -620,11 +608,6 @@ msgstr "Хэлтсээр ангилсан амралт, чөлөө"
 msgid "Black"
 msgstr "Хар"
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Алдаа! Рекурс цэс үүсгэж болохгүй"
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -635,32 +618,6 @@ msgstr "Амралт, чөлөө"
 msgid "Maximum Leaves Allowed"
 msgstr "Зөвшөөрсөн амралт, чөлөөний дээд хэмжээ"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-"Хуваарилагдсан боломжит амралт, чөлөөний хоног нь амралт, чөлөөний хүсэлт "
-"дээрхээс бага тул амралт, чөлөөг батламжилж болохгүй байна( %s) .' "
-"%(record.category_id.name)))"
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -779,11 +736,6 @@ msgstr "Эхлэх огноо нь дуусах огнооноос хойш ба
 msgid "Request Type"
 msgstr "Хүсэлтийн төрөл"
 
-#. module: hr_holidays
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,active:0
 msgid ""
@@ -824,11 +776,6 @@ msgstr ""
 msgid "Leaves Analysis"
 msgstr "Амралт, чөлөөний шинжилгээ"
 
-#. module: hr_holidays
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: view:hr.holidays.summary.dept:0
@@ -854,25 +801,12 @@ msgstr ""
 msgid "Validated"
 msgstr "Батламжилсан"
 
-#. module: hr_holidays
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr "Амралт, чөлөө хуваарилах хүсэл"
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-"болохгүй!"
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -1042,11 +976,6 @@ msgstr "Зөвшөөрөх"
 msgid "Linked Requests"
 msgstr "Холбоотой амралт, чөлөө"
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "osv_memory обьект нь дүрмийг дэмжихгүй"
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -1102,6 +1031,33 @@ msgstr ""
 #~ msgid "Leave Days"
 #~ msgstr "Амралт, чөлөөтэй өдрүүд"
 
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Алдаа! Рекурс цэс үүсгэж болохгүй"
+
+#, python-format
+#~ msgid ""
+#~ "You cannot validate leaves for %s while available leaves are less than asked "
+#~ "leaves.' %(record.category_id.name)))\n"
+#~ "                nb = -(record.number_of_days_temp)\n"
+#~ "            else:\n"
+#~ "                nb = record.number_of_days_temp\n"
+#~ "\n"
+#~ "            if record.holiday_type == 'employee' and record.employee_id:\n"
+#~ "                user_id = record.employee_id.user_id and "
+#~ "record.employee_id.user_id.id or uid\n"
+#~ "\n"
+#~ "            self.write(cr, uid, [record.id], {'state':'confirm', "
+#~ "'number_of_days': nb, 'user_id': user_id })\n"
+#~ "        return True\n"
+#~ "\n"
+#~ "    def holidays_refuse(self, cr, uid, ids, *args):\n"
+#~ "        vals = {'state': 'refuse'}\n"
+#~ "        ids2 = self.pool.get('hr.employee"
+#~ msgstr ""
+#~ "Хуваарилагдсан боломжит амралт, чөлөөний хоног нь амралт, чөлөөний хүсэлт "
+#~ "дээрхээс бага тул амралт, чөлөөг батламжилж болохгүй байна( %s) .' "
+#~ "%(record.category_id.name)))"
+
 #, python-format
 #~ msgid ""
 #~ "You cannot validate leaves for %s while available leaves are less than asked "
@@ -1122,3 +1078,18 @@ msgstr ""
 
 #~ msgid "My Leaves by Type"
 #~ msgstr "Өөрийн амралт, чөлөөний төрөл"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "osv_memory обьект нь дүрмийг дэмжихгүй"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Дэлгэцийн архитектур алдаатай!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+#~ "болохгүй!"
diff --git a/addons/hr_holidays/i18n/nl.po b/addons/hr_holidays/i18n/nl.po
index d0763d5536a..d561e441f15 100644
--- a/addons/hr_holidays/i18n/nl.po
+++ b/addons/hr_holidays/i18n/nl.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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-12-02 07:56+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-03 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -49,24 +49,6 @@ msgstr "Maximaal toegestaan verlof - opgenomen verlof"
 msgid "Leaves Management"
 msgstr "Verlofbeheer"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = obj_hr_holiday_status.get_days_cat( cr, "
-"uid, [record.holiday_status_id.id], record.category_id.id, "
-"False)[record.holiday_status_id.id]['remaining_leaves']\n"
-"                    if leaves_rest < leave_asked:\n"
-"                        raise osv.except_osv(_('Warning!"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
@@ -74,11 +56,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Groepeer op..."
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de actie-definitie."
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -229,6 +206,14 @@ msgstr "Controle"
 msgid "Warning !"
 msgstr "Waarschuwing!"
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -448,11 +433,6 @@ msgstr "Rood"
 msgid "Leaves by Type"
 msgstr "Verlof per soort"
 
-#. module: hr_holidays
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Salmon"
@@ -463,6 +443,11 @@ msgstr "Lichtzalm"
 msgid "Wheat"
 msgstr "Tarwe"
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -491,11 +476,6 @@ msgstr "Verlofsoort zoeken"
 msgid "July"
 msgstr "Juli"
 
-#. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -525,6 +505,14 @@ msgstr " Maand "
 msgid "Leaves By Month"
 msgstr "Verlof per maand"
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -642,11 +630,6 @@ msgstr "Vakanties per afdelng"
 msgid "Black"
 msgstr "Zwart"
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fout ! U kunt geen recursief menu maken."
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -657,46 +640,6 @@ msgstr "Vakantie"
 msgid "Maximum Leaves Allowed"
 msgstr "Maximaal toegestane verlofdagen"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-"U kunt geen verlof goedkeuren voor %s als het beschikbare verlof minder is "
-"dan het gevraagde verlof.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -817,11 +760,6 @@ msgstr ""
 msgid "Request Type"
 msgstr "Soort aanvraag"
 
-#. module: hr_holidays
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "De modulenaam moet uniek zijn !"
-
 #. module: hr_holidays
 #: help:hr.holidays.status,active:0
 msgid ""
@@ -862,11 +800,6 @@ msgstr ""
 msgid "Leaves Analysis"
 msgstr "Verlof analyse"
 
-#. module: hr_holidays
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "Regel moet tenminste één toegangsrecht aangevinkt hebben !"
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: view:hr.holidays.summary.dept:0
@@ -892,24 +825,12 @@ msgstr ""
 msgid "Validated"
 msgstr "Goedgekeurd"
 
-#. module: hr_holidays
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr "Reserveringsaanvraag"
 
-#. module: hr_holidays
-#: 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 karakters bevatten !"
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -1079,11 +1000,6 @@ msgstr "Goedkeuren"
 msgid "Linked Requests"
 msgstr "Gekoppelde aanvragen"
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Regels worden niet ondersteund bij osv_memory objecten !"
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -1287,6 +1203,14 @@ msgstr ""
 #~ msgid "Validate"
 #~ msgstr "Bevestig"
 
+#~ 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 karakters bevatten !"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ongeldige modelnaam in de actie-definitie."
+
 #~ msgid "Employee Holidays"
 #~ msgstr "Verlof werknemer"
 
@@ -1320,6 +1244,9 @@ msgstr ""
 #~ msgid "Encoding of annual available holidays."
 #~ msgstr "Vastleggen van jaarlijks beschikbare verlofdagen"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML voor weergave!"
+
 #~ msgid "Report Options"
 #~ msgstr "Opties overzicht"
 
@@ -1444,6 +1371,47 @@ msgstr ""
 #~ msgid "Leave Days"
 #~ msgstr "Verlofdagen"
 
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fout ! U kunt geen recursief menu maken."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot validate leaves for %s while available leaves are less than asked "
+#~ "leaves.' %(record.category_id.name)))\n"
+#~ "                nb = -(record.number_of_days_temp)\n"
+#~ "            else:\n"
+#~ "                nb = record.number_of_days_temp\n"
+#~ "\n"
+#~ "            if record.holiday_type == 'employee' and record.employee_id:\n"
+#~ "                user_id = record.employee_id.user_id and "
+#~ "record.employee_id.user_id.id or uid\n"
+#~ "\n"
+#~ "            self.write(cr, uid, [record.id], {'state':'confirm', "
+#~ "'number_of_days': nb, 'user_id': user_id })\n"
+#~ "        return True\n"
+#~ "\n"
+#~ "    def holidays_refuse(self, cr, uid, ids, *args):\n"
+#~ "        vals = {'state': 'refuse'}\n"
+#~ "        ids2 = self.pool.get('hr.employee"
+#~ msgstr ""
+#~ "U kunt geen verlof goedkeuren voor %s als het beschikbare verlof minder is "
+#~ "dan het gevraagde verlof.' %(record.category_id.name)))\n"
+#~ "                nb = -(record.number_of_days_temp)\n"
+#~ "            else:\n"
+#~ "                nb = record.number_of_days_temp\n"
+#~ "\n"
+#~ "            if record.holiday_type == 'employee' and record.employee_id:\n"
+#~ "                user_id = record.employee_id.user_id and "
+#~ "record.employee_id.user_id.id or uid\n"
+#~ "\n"
+#~ "            self.write(cr, uid, [record.id], {'state':'confirm', "
+#~ "'number_of_days': nb, 'user_id': user_id })\n"
+#~ "        return True\n"
+#~ "\n"
+#~ "    def holidays_refuse(self, cr, uid, ids, *args):\n"
+#~ "        vals = {'state': 'refuse'}\n"
+#~ "        ids2 = self.pool.get('hr.employee"
+
 #~ msgid "Extended options..."
 #~ msgstr "Uitgebreide opties..."
 
@@ -1472,3 +1440,18 @@ msgstr ""
 
 #~ msgid " Leave Type"
 #~ msgstr " Verlofsoort"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Regels worden niet ondersteund bij osv_memory objecten !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "Regel moet tenminste één toegangsrecht aangevinkt hebben !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "De modulenaam moet uniek zijn !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
diff --git a/addons/hr_holidays/i18n/nl_BE.po b/addons/hr_holidays/i18n/nl_BE.po
index 1f6e8843584..1d2f11af3f8 100644
--- a/addons/hr_holidays/i18n/nl_BE.po
+++ b/addons/hr_holidays/i18n/nl_BE.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-04 12:21+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -53,14 +53,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -81,9 +77,8 @@ msgid "Refused"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -97,7 +92,6 @@ msgid "Brown"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -119,11 +113,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -202,12 +191,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -220,6 +222,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -397,6 +400,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -405,8 +413,9 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -415,13 +424,13 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:available.holidays.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_holidays
@@ -446,6 +455,19 @@ msgstr ""
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -555,11 +577,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -570,29 +587,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -648,6 +642,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -683,7 +678,8 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -692,20 +688,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -742,6 +724,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -777,12 +768,6 @@ msgstr ""
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -793,11 +778,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -805,14 +785,14 @@ msgid "Print"
 msgstr ""
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -837,6 +817,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -947,11 +928,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -968,12 +944,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
diff --git a/addons/hr_holidays/i18n/pl.po b/addons/hr_holidays/i18n/pl.po
index c476e6ab236..05a330a3c76 100644
--- a/addons/hr_holidays/i18n/pl.po
+++ b/addons/hr_holidays/i18n/pl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-26 08: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-10-30 05:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -52,14 +52,10 @@ msgstr "Urlopy"
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr "Grupuj wg..."
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -80,10 +76,9 @@ msgid "Refused"
 msgstr "Odrzucone"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
-msgstr "Zatwierdzony wymiar urlopu"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
+msgstr "Kategoria pracownika"
 
 #. module: hr_holidays
 #: selection:hr.holidays,allocation_type:0
@@ -96,7 +91,6 @@ msgid "Brown"
 msgstr "Brązowy"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr "Pozostałe dni"
@@ -120,11 +114,6 @@ msgstr ""
 "Przełożony może pozwolić, aby to pole było puste, jeśli wniosek dotyczy "
 "wszystkich pracowników."
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr "Dni urlopu"
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -206,12 +195,25 @@ msgstr ""
 "Wybierz 'Wniosek o zwiększenie urlopu' jeśli chcesz zwiększyć liczbę dni "
 "wolnych dla kogoś."
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr "Ostrzeżenie !"
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -224,6 +226,7 @@ msgstr "Raport podsumowania urlopów wg pracowników"
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -406,6 +409,11 @@ msgstr "Jasno-łososiowy"
 msgid "Wheat"
 msgstr "Pszenny"
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -414,25 +422,26 @@ msgid "Number of Days"
 msgstr "Liczba dni"
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
-msgstr "Kategoria pracownika"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
+msgstr "Zatwierdzony wymiar urlopu"
 
 #. module: hr_holidays
 #: view:board.board:0
 msgid "Remaining Leave by Type and User"
 msgstr "Urlop do wykorzystania wg Typu i Użytkowników"
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
+msgstr ""
+
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "July"
 msgstr "Lipiec"
 
-#. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -457,6 +466,19 @@ msgstr "Pracowników"
 msgid " Month "
 msgstr " Miesiąc "
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -572,11 +594,6 @@ msgstr ""
 msgid "Black"
 msgstr "Czarny"
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -587,29 +604,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr "Maksymalna liczba dni urlopowych"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -665,6 +659,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -700,7 +695,8 @@ msgstr "Data"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -709,20 +705,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -759,6 +741,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -794,14 +785,6 @@ msgstr "Zatwierdzony"
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: 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: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -812,11 +795,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -824,14 +802,14 @@ msgid "Print"
 msgstr "Drukuj"
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -856,6 +834,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -966,11 +945,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -987,12 +961,6 @@ msgstr "Jasnożółty"
 msgid "Light Pink"
 msgstr "Jasnoróżowy"
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
@@ -1153,6 +1121,12 @@ msgstr ""
 #~ msgid "Print Summary of Holidays"
 #~ msgstr "Drukuj podsumowanie urlopów"
 
+#~ 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 "Request is approved."
 #~ msgstr "Wniosek aprobowano."
 
@@ -1174,6 +1148,12 @@ msgstr ""
 #~ msgid "You have to select at least 1 Department. Try again."
 #~ msgstr "Musisz wybrac co najmniej jeden dział. Spróbuj ponownie."
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
 #~ msgid "Validate"
 #~ msgstr "Zatwierdź"
 
@@ -1245,3 +1225,6 @@ msgstr ""
 
 #~ msgid "New Holidays Request"
 #~ msgstr "Nowy wniosek urlopowy"
+
+#~ msgid "Leave Days"
+#~ msgstr "Dni urlopu"
diff --git a/addons/hr_holidays/i18n/pt.po b/addons/hr_holidays/i18n/pt.po
index 1a1f4d08d07..498bad83ef6 100644
--- a/addons/hr_holidays/i18n/pt.po
+++ b/addons/hr_holidays/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-12 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/pt_BR.po b/addons/hr_holidays/i18n/pt_BR.po
index 5a0f7a77e2e..4163013cb6e 100644
--- a/addons/hr_holidays/i18n/pt_BR.po
+++ b/addons/hr_holidays/i18n/pt_BR.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 08:51+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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-31 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -53,14 +53,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -81,9 +77,8 @@ msgid "Refused"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -97,7 +92,6 @@ msgid "Brown"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -119,11 +113,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -202,12 +191,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr "Aviso !"
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -220,6 +222,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -397,6 +400,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -405,8 +413,9 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -415,14 +424,14 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
+#: selection:available.holidays.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -446,6 +455,19 @@ msgstr ""
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -555,11 +577,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -570,29 +587,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -648,6 +642,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -683,7 +678,8 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -692,20 +688,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -742,6 +724,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -777,14 +768,6 @@ msgstr ""
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-"especial!"
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -795,11 +778,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -807,14 +785,14 @@ msgid "Print"
 msgstr ""
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -839,6 +817,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -949,11 +928,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -970,12 +944,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
@@ -1009,3 +977,12 @@ msgstr ""
 msgid ""
 "You Cannot Validate leaves while available leaves are less than asked leaves."
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalido XML para Arquitetura da View"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
+#~ "especial!"
diff --git a/addons/hr_holidays/i18n/ro.po b/addons/hr_holidays/i18n/ro.po
index aa4cc01464e..7bd73d0c059 100644
--- a/addons/hr_holidays/i18n/ro.po
+++ b/addons/hr_holidays/i18n/ro.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 08:48+0000\n"
 "Last-Translator: filsys <office@filsystem.ro>\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-10-31 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -52,14 +52,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -80,9 +76,8 @@ msgid "Refused"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -96,7 +91,6 @@ msgid "Brown"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -118,11 +112,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -201,12 +190,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr "Alerta !"
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -219,6 +221,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -396,6 +399,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -404,8 +412,9 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -414,13 +423,13 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:available.holidays.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_holidays
@@ -445,6 +454,19 @@ msgstr ""
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -554,11 +576,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -569,29 +586,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -647,6 +641,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -682,7 +677,8 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -691,20 +687,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -741,6 +723,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -776,12 +767,6 @@ msgstr ""
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -792,11 +777,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -804,14 +784,14 @@ msgid "Print"
 msgstr ""
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -836,6 +816,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -946,11 +927,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -967,12 +943,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
diff --git a/addons/hr_holidays/i18n/ru.po b/addons/hr_holidays/i18n/ru.po
index b3d5c44b70d..e21e4e3d1da 100644
--- a/addons/hr_holidays/i18n/ru.po
+++ b/addons/hr_holidays/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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 11:43+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-31 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -53,14 +53,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -81,9 +77,8 @@ msgid "Refused"
 msgstr "Отклонено"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -97,7 +92,6 @@ msgid "Brown"
 msgstr "Коричневый"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -119,11 +113,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -202,12 +191,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr "Внимание!"
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -220,6 +222,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -397,6 +400,11 @@ msgstr "Светлый оранжево-розовый"
 msgid "Wheat"
 msgstr "Пшеничный"
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -405,8 +413,9 @@ msgid "Number of Days"
 msgstr "Кол-во дней"
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -415,14 +424,14 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
+#: selection:available.holidays.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -446,6 +455,19 @@ msgstr "Сотрудник(и)"
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -555,11 +577,6 @@ msgstr ""
 msgid "Black"
 msgstr "Черный"
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -570,29 +587,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr "Максимально позволенные отпуска"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -648,6 +642,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -683,7 +678,8 @@ msgstr "Дата"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -692,20 +688,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -742,6 +724,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -777,14 +768,6 @@ msgstr "Проверено"
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -795,11 +778,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -807,14 +785,14 @@ msgid "Print"
 msgstr "Печать"
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -839,6 +817,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -949,11 +928,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -970,12 +944,6 @@ msgstr "Светло-желтый"
 msgid "Light Pink"
 msgstr "Светло-розовый"
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
@@ -1016,6 +984,15 @@ msgstr ""
 #~ msgid "Section"
 #~ msgstr "Раздел"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра архитектуры!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
+
 #~ msgid "Color of the status"
 #~ msgstr "Цвет статуса"
 
@@ -1205,6 +1182,9 @@ msgstr ""
 #~ msgid "Reufse"
 #~ msgstr "Отказать"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Недопустимое имя модели в определении действия."
+
 #~ msgid "Both"
 #~ msgstr "Оба"
 
diff --git a/addons/hr_holidays/i18n/sl.po b/addons/hr_holidays/i18n/sl.po
index 324545f93a3..d4ac86a6a35 100644
--- a/addons/hr_holidays/i18n/sl.po
+++ b/addons/hr_holidays/i18n/sl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 10:01+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-10-31 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -52,14 +52,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Napačno ime modela v definiciji dejanja."
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -80,9 +76,8 @@ msgid "Refused"
 msgstr "Zavrnjeno"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -96,7 +91,6 @@ msgid "Brown"
 msgstr "Rjava"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -118,11 +112,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -201,12 +190,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr "Opozorilo!"
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -219,6 +221,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -396,6 +399,11 @@ msgstr ""
 msgid "Wheat"
 msgstr "Pšenična"
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -404,8 +412,9 @@ msgid "Number of Days"
 msgstr "Število dni"
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -414,14 +423,14 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
+#: selection:available.holidays.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -445,6 +454,19 @@ msgstr "Zaposlenec/Zaposlenci"
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -554,11 +576,6 @@ msgstr ""
 msgid "Black"
 msgstr "Črna"
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -569,29 +586,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -647,6 +641,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -682,7 +677,8 @@ msgstr "Datum"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -691,20 +687,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -741,6 +723,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -776,13 +767,6 @@ msgstr "Potrjeno"
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -793,11 +777,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -805,14 +784,14 @@ msgid "Print"
 msgstr "Natisni"
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -837,6 +816,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -947,11 +927,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -968,12 +943,6 @@ msgstr "Svetlo rumena"
 msgid "Light Pink"
 msgstr "Svetlo rožnata"
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
@@ -1056,5 +1025,16 @@ msgstr ""
 #~ msgid "Approved Request"
 #~ msgstr "Odobren zahtevek"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Napačno ime modela v definiciji dejanja."
+
 #~ msgid "My Holidays Request"
 #~ msgstr "Moj zahtevek za dopust"
diff --git a/addons/hr_holidays/i18n/sq.po b/addons/hr_holidays/i18n/sq.po
index ea5744ab86a..4a4aa31ccf8 100644
--- a/addons/hr_holidays/i18n/sq.po
+++ b/addons/hr_holidays/i18n/sq.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -53,14 +53,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -81,9 +77,8 @@ msgid "Refused"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -97,7 +92,6 @@ msgid "Brown"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -119,11 +113,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -202,12 +191,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -220,6 +222,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -397,6 +400,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -405,8 +413,9 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -415,13 +424,13 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:available.holidays.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_holidays
@@ -446,6 +455,19 @@ msgstr ""
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -555,11 +577,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -570,29 +587,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -648,6 +642,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -683,7 +678,8 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -692,20 +688,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -742,6 +724,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -777,12 +768,6 @@ msgstr ""
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -793,11 +778,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -805,14 +785,14 @@ msgid "Print"
 msgstr ""
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -837,6 +817,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -947,11 +928,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -968,12 +944,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
diff --git a/addons/hr_holidays/i18n/sr.po b/addons/hr_holidays/i18n/sr.po
index 4131a4714b0..37c49975ff0 100644
--- a/addons/hr_holidays/i18n/sr.po
+++ b/addons/hr_holidays/i18n/sr.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-12-28 10:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-10-30 05:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -53,14 +53,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -81,9 +77,8 @@ msgid "Refused"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -97,7 +92,6 @@ msgid "Brown"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -119,11 +113,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -202,12 +191,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -220,6 +222,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -397,6 +400,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -405,8 +413,9 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -415,13 +424,13 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:available.holidays.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_holidays
@@ -446,6 +455,19 @@ msgstr ""
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -555,11 +577,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -570,29 +587,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -648,6 +642,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -683,7 +678,8 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -692,20 +688,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -742,6 +724,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -777,12 +768,6 @@ msgstr ""
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -793,11 +778,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -805,14 +785,14 @@ msgid "Print"
 msgstr ""
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -837,6 +817,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -947,11 +928,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -968,12 +944,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
diff --git a/addons/hr_holidays/i18n/sr@latin.po b/addons/hr_holidays/i18n/sr@latin.po
index 41453636c9b..52411423a34 100644
--- a/addons/hr_holidays/i18n/sr@latin.po
+++ b/addons/hr_holidays/i18n/sr@latin.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-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sv.po b/addons/hr_holidays/i18n/sv.po
index a070bb3a958..7d182575f17 100644
--- a/addons/hr_holidays/i18n/sv.po
+++ b/addons/hr_holidays/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-23 09:32+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-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -49,24 +49,6 @@ msgstr ""
 msgid "Leaves Management"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = obj_hr_holiday_status.get_days_cat( cr, "
-"uid, [record.holiday_status_id.id], record.category_id.id, "
-"False)[record.holiday_status_id.id]['remaining_leaves']\n"
-"                    if leaves_rest < leave_asked:\n"
-"                        raise osv.except_osv(_('Warning!"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
@@ -74,11 +56,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -224,6 +201,14 @@ msgstr ""
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -404,11 +389,6 @@ msgstr "Röd"
 msgid "Leaves by Type"
 msgstr ""
 
-#. module: hr_holidays
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Salmon"
@@ -419,6 +399,11 @@ msgstr "Ljusrosa"
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -447,11 +432,6 @@ msgstr ""
 msgid "July"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
@@ -479,6 +459,14 @@ msgstr ""
 msgid "Leaves By Month"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -588,11 +576,6 @@ msgstr ""
 msgid "Black"
 msgstr "Svart"
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -603,29 +586,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -744,11 +704,6 @@ msgstr ""
 msgid "Request Type"
 msgstr ""
 
-#. module: hr_holidays
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,active:0
 msgid ""
@@ -783,11 +738,6 @@ msgstr ""
 msgid "Leaves Analysis"
 msgstr ""
 
-#. module: hr_holidays
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: view:hr.holidays.summary.dept:0
@@ -811,24 +761,12 @@ msgstr ""
 msgid "Validated"
 msgstr "Beslutad"
 
-#. module: hr_holidays
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -989,11 +927,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -1044,6 +977,14 @@ msgid ""
 "You Cannot Validate leaves while available leaves are less than asked leaves."
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
+
 #~ msgid ""
 #~ "Human Ressources: Holidays tracking and workflow\n"
 #~ "\n"
diff --git a/addons/hr_holidays/i18n/th.po b/addons/hr_holidays/i18n/th.po
index 91913ba67da..a8f26d78755 100644
--- a/addons/hr_holidays/i18n/th.po
+++ b/addons/hr_holidays/i18n/th.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-01-30 15:25+0000\n"
 "Last-Translator: Thiti Sriyai <sriyai4@yahoo.com>\n"
 "Language-Team: Thai <th@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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -53,14 +53,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -81,9 +77,8 @@ msgid "Refused"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -97,7 +92,6 @@ msgid "Brown"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -119,11 +113,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -202,12 +191,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -220,6 +222,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -397,6 +400,11 @@ msgstr ""
 msgid "Wheat"
 msgstr "สีเหลืองอ่อน"
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -405,8 +413,9 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -415,13 +424,13 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:available.holidays.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_holidays
@@ -446,6 +455,19 @@ msgstr ""
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -555,11 +577,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -570,29 +587,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -648,6 +642,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -683,7 +678,8 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -692,20 +688,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -742,6 +724,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -777,12 +768,6 @@ msgstr ""
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -793,11 +778,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -805,14 +785,14 @@ msgid "Print"
 msgstr ""
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -837,6 +817,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -947,11 +928,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -968,12 +944,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
diff --git a/addons/hr_holidays/i18n/tlh.po b/addons/hr_holidays/i18n/tlh.po
index 1508462cb7a..2e0edbf84ea 100644
--- a/addons/hr_holidays/i18n/tlh.po
+++ b/addons/hr_holidays/i18n/tlh.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-04 09:47+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Klingon; tlhIngan-Hol <tlh@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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -53,14 +53,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -81,9 +77,8 @@ msgid "Refused"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -97,7 +92,6 @@ msgid "Brown"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -119,11 +113,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -202,12 +191,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -220,6 +222,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -397,6 +400,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -405,8 +413,9 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -415,13 +424,13 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:available.holidays.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_holidays
@@ -446,6 +455,19 @@ msgstr ""
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -555,11 +577,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -570,29 +587,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -648,6 +642,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -683,7 +678,8 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -692,20 +688,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -742,6 +724,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -777,12 +768,6 @@ msgstr ""
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -793,11 +778,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -805,14 +785,14 @@ msgid "Print"
 msgstr ""
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -837,6 +817,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -947,11 +928,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -968,12 +944,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
diff --git a/addons/hr_holidays/i18n/tr.po b/addons/hr_holidays/i18n/tr.po
index 95a8e0c877e..81eb64b6537 100644
--- a/addons/hr_holidays/i18n/tr.po
+++ b/addons/hr_holidays/i18n/tr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 09:36+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-10-31 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -52,14 +52,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -80,9 +76,8 @@ msgid "Refused"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -96,7 +91,6 @@ msgid "Brown"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -118,11 +112,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -201,12 +190,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -219,6 +221,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -396,6 +399,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -404,8 +412,9 @@ msgid "Number of Days"
 msgstr "Gün Sayısı"
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -414,14 +423,14 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
+#: selection:available.holidays.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -445,6 +454,19 @@ msgstr ""
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -554,11 +576,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -569,29 +586,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -647,6 +641,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -682,7 +677,8 @@ msgstr "Tarih"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -691,20 +687,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -741,6 +723,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -776,12 +767,6 @@ msgstr "Doğrulanmış"
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -792,11 +777,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -804,14 +784,14 @@ msgid "Print"
 msgstr "Yazdır"
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -836,6 +816,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -946,11 +927,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -967,12 +943,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
@@ -1007,6 +977,9 @@ msgid ""
 "You Cannot Validate leaves while available leaves are less than asked leaves."
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
+
 #~ msgid "New Holidays Request"
 #~ msgstr "Yeni İzin Talebi"
 
diff --git a/addons/hr_holidays/i18n/uk.po b/addons/hr_holidays/i18n/uk.po
index dbd13066a91..03bccc4ccc4 100644
--- a/addons/hr_holidays/i18n/uk.po
+++ b/addons/hr_holidays/i18n/uk.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-04 09:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Ukrainian <uk@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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -53,14 +53,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -81,9 +77,8 @@ msgid "Refused"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -97,7 +92,6 @@ msgid "Brown"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -119,11 +113,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -202,12 +191,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -220,6 +222,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -397,6 +400,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -405,8 +413,9 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -415,13 +424,13 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:available.holidays.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_holidays
@@ -446,6 +455,19 @@ msgstr ""
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -555,11 +577,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -570,29 +587,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -648,6 +642,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -683,7 +678,8 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -692,20 +688,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -742,6 +724,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -777,12 +768,6 @@ msgstr ""
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -793,11 +778,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -805,14 +785,14 @@ msgid "Print"
 msgstr ""
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -837,6 +817,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -947,11 +928,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -968,12 +944,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
diff --git a/addons/hr_holidays/i18n/vi.po b/addons/hr_holidays/i18n/vi.po
index 528c068b815..190f5fede71 100644
--- a/addons/hr_holidays/i18n/vi.po
+++ b/addons/hr_holidays/i18n/vi.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-10-30 05:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -53,14 +53,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -81,9 +77,8 @@ msgid "Refused"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -97,7 +92,6 @@ msgid "Brown"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -119,11 +113,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -202,12 +191,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -220,6 +222,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -397,6 +400,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -405,8 +413,9 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -415,13 +424,13 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:available.holidays.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_holidays
@@ -446,6 +455,19 @@ msgstr ""
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -555,11 +577,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -570,29 +587,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -648,6 +642,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -683,7 +678,8 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -692,20 +688,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -742,6 +724,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -777,12 +768,6 @@ msgstr ""
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -793,11 +778,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -805,14 +785,14 @@ msgid "Print"
 msgstr ""
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -837,6 +817,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -947,11 +928,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -968,12 +944,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index fed686917ad..93d816aa88b 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 09:08+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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-10-31 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -52,14 +52,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "在动作定义中使用了无效的模快名。"
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -80,9 +76,8 @@ msgid "Refused"
 msgstr "被拒绝"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -96,7 +91,6 @@ msgid "Brown"
 msgstr "棕"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -118,11 +112,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -201,12 +190,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr "警告！"
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -219,6 +221,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -396,6 +399,11 @@ msgstr "浅橙红色"
 msgid "Wheat"
 msgstr "淡黄色"
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -404,8 +412,9 @@ msgid "Number of Days"
 msgstr "天数"
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -414,14 +423,14 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效的视图结构xml文件!"
+#: selection:available.holidays.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -445,6 +454,19 @@ msgstr "员工"
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -554,11 +576,6 @@ msgstr ""
 msgid "Black"
 msgstr "黑色"
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -569,29 +586,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr "最大休假允许"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -647,6 +641,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -682,7 +677,8 @@ msgstr "日期"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -691,20 +687,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -741,6 +723,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -776,12 +767,6 @@ msgstr "确认"
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -792,11 +777,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -804,14 +784,14 @@ msgid "Print"
 msgstr "打印"
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -836,6 +816,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -946,11 +927,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -967,12 +943,6 @@ msgstr "浅黄色"
 msgid "Light Pink"
 msgstr "浅粉红色"
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
@@ -1160,6 +1130,10 @@ msgstr ""
 #~ msgid "Holidays def Request"
 #~ msgstr "假期申请定义"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+
 #~ msgid "Print Summary of Holidays"
 #~ msgstr "打印假期摘要"
 
@@ -1184,6 +1158,9 @@ msgstr ""
 #~ msgid "All Holidays Requests"
 #~ msgstr "所有假期申请"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "在动作定义中使用了无效的模快名。"
+
 #~ msgid "Validate"
 #~ msgstr "确认"
 
@@ -1199,6 +1176,9 @@ msgstr ""
 #~ msgid "Encoding of annual available holidays."
 #~ msgstr "每年可得到的假期编码"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效的视图结构xml文件!"
+
 #~ msgid "His manager approves the request"
 #~ msgstr "经理批准这申请"
 
diff --git a/addons/hr_holidays/i18n/zh_TW.po b/addons/hr_holidays/i18n/zh_TW.po
index 6bf0061068b..261c7e83eb6 100644
--- a/addons/hr_holidays/i18n/zh_TW.po
+++ b/addons/hr_holidays/i18n/zh_TW.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-04 09:45+0000\n"
 "Last-Translator: <>\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-10-30 05:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -52,14 +52,10 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
@@ -80,9 +76,8 @@ msgid "Refused"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -96,7 +91,6 @@ msgid "Brown"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
 msgstr ""
@@ -118,11 +112,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -201,12 +190,25 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -219,6 +221,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -396,6 +399,11 @@ msgstr ""
 msgid "Wheat"
 msgstr ""
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -404,8 +412,9 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -414,13 +423,13 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: selection:available.holidays.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_holidays
@@ -445,6 +454,19 @@ msgstr ""
 msgid " Month "
 msgstr ""
 
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
+msgstr ""
+
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
 msgid ""
@@ -554,11 +576,6 @@ msgstr ""
 msgid "Black"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
@@ -569,29 +586,6 @@ msgstr ""
 msgid "Maximum Leaves Allowed"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
@@ -647,6 +641,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -682,7 +677,8 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
@@ -691,20 +687,6 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
@@ -741,6 +723,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -776,12 +767,6 @@ msgstr ""
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -792,11 +777,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -804,14 +784,14 @@ msgid "Print"
 msgstr ""
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
+#: view:hr.holidays.status:0
+msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -836,6 +816,7 @@ msgid "May"
 msgstr ""
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -946,11 +927,6 @@ msgstr ""
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -967,12 +943,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
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 b5786141673..bd3ffad3065 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/de.po b/addons/hr_payroll/i18n/de.po
index ec09e9ae940..cd8acc57e6a 100644
--- a/addons/hr_payroll/i18n/de.po
+++ b/addons/hr_payroll/i18n/de.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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
diff --git a/addons/hr_payroll/i18n/es.po b/addons/hr_payroll/i18n/es.po
index 1a4c911c269..1b8a288664e 100644
--- a/addons/hr_payroll/i18n/es.po
+++ b/addons/hr_payroll/i18n/es.po
@@ -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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
diff --git a/addons/hr_payroll/i18n/et.po b/addons/hr_payroll/i18n/et.po
index 662c32cf850..e33c067f8f2 100644
--- a/addons/hr_payroll/i18n/et.po
+++ b/addons/hr_payroll/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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-06-25 17:48+0000\n"
 "Last-Translator: lyyser <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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
@@ -41,15 +41,6 @@ msgstr ""
 msgid "Recompute Sheet"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error : %s ' % (e)))\n"
-"\n"
-"                if sal_type in ('gross', 'net"
-msgstr ""
-
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Employees Salary Details"
@@ -60,11 +51,6 @@ msgstr ""
 msgid "Allowances with Basic:"
 msgstr ""
 
-#. module: hr_payroll
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
 #. module: hr_payroll
 #: report:employees.salary:0
 #: report:salary.structure:0
@@ -158,6 +144,12 @@ msgstr ","
 msgid "Set to Draft"
 msgstr "Sea mustandiks"
 
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Variable Error: %s "
+msgstr ""
+
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Expire"
@@ -168,83 +160,6 @@ msgstr ""
 msgid "Half-Pay Holiday"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Please check configuration of %s, payroll head is missing' % "
-"(hday.holiday_status_id.name)))\n"
-"                    \n"
-"                res = {\n"
-"                    'slip_id':slip.id,\n"
-"                    'name':hday.holiday_status_id.name + '-%s' % "
-"(hday.number_of_days),\n"
-"                    'code':hday.holiday_status_id.code,\n"
-"                    'amount_type':'fix',\n"
-"                    'category_id':hday.holiday_status_id.head_id.id,\n"
-"                    'sequence':hday.holiday_status_id.head_id.sequence\n"
-"                }\n"
-"                days = hday.number_of_days\n"
-"                if hday.number_of_days < 0:\n"
-"                    days = hday.number_of_days * -1\n"
-"                total_leave += days\n"
-"                if hday.holiday_status_id.type == 'paid':\n"
-"                    paid_leave += days\n"
-"                    continue\n"
-"#                    res['name'] = hday.holiday_status_id.name + '-%s' % "
-"(days)\n"
-"#                    res['amount'] = perday * days\n"
-"#                    res['type'] = 'allowance'\n"
-"#                    leave += days\n"
-"#                    total += perday * days\n"
-"                \n"
-"                elif hday.holiday_status_id.type == 'halfpaid':\n"
-"                    paid_leave += (days / 2)\n"
-"                    res['name'] = hday.holiday_status_id.name + '-%s/2' % "
-"(days)\n"
-"                    res['amount'] = perday * (days/2)\n"
-"                    total += perday * (days/2)\n"
-"                    leave += days / 2\n"
-"                    res['type'] = 'deduction'\n"
-"                else:\n"
-"                    res['name'] = hday.holiday_status_id.name + '-%s' % "
-"(days)\n"
-"                    res['amount'] = perday * days\n"
-"                    res['type'] = 'deduction'\n"
-"                    leave += days\n"
-"                    total += perday * days\n"
-"\n"
-"                slip_line_pool.create(cr, uid, res, context=context)\n"
-"            basic = basic - total\n"
-"            leaves = total\n"
-"            update.update({\n"
-"                'basic':basic,\n"
-"                'basic_before_leaves': round(basic_before_leaves),\n"
-"                'leaves':total,\n"
-"                'holiday_days':leave,\n"
-"                'worked_days':working_day - leave,\n"
-"                'working_days':working_day,\n"
-"            })\n"
-"            self.write(cr, uid, [slip.id], update, context=context)\n"
-"        return True\n"
-"hr_payslip()\n"
-"\n"
-"class hr_payslip_line(osv.osv):\n"
-"    '''\n"
-"    Payslip Line\n"
-"    '''\n"
-"    \n"
-"    _name = 'hr.payslip.line'\n"
-"    _description = 'Payslip Line'\n"
-"\n"
-"    def onchange_category(self, cr, uid, ids, category_id):\n"
-"        seq = 0\n"
-"        res = {\n"
-"        }\n"
-"        if category_id:\n"
-"            category = self.pool.get('hr.allounce.deduction.categoty"
-msgstr ""
-
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: field:hr.payslip,other_pay:0
@@ -341,6 +256,12 @@ msgstr ""
 msgid "Amount"
 msgstr "Hulk"
 
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please check configuration of %s, payroll head is missing"
+msgstr ""
+
 #. module: hr_payroll
 #: selection:company.contribution,amount_type:0
 msgid "Percentage"
@@ -520,40 +441,6 @@ msgstr "Lõppkuupäev"
 msgid "Employee PaySlip"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error : %s ' % (e)))\n"
-"                amount = 0.0\n"
-"                if line.amount_type == 'per':\n"
-"                    amount = amt * line.amount\n"
-"                elif line.amount_type == 'func':\n"
-"                    amount = slip_line_pool.execute_function(cr, uid, "
-"line.id, amt, context)\n"
-"                elif line.amount_type == 'fix':\n"
-"                    amount = line.amount\n"
-"                \n"
-"                if line.type == 'allowance':\n"
-"                    allowance += amount\n"
-"                elif line.type == 'deduction':\n"
-"                    deduction += amount\n"
-"            \n"
-"            vals[employee.id] = {\n"
-"                'basic':basic, \n"
-"                'advantages_gross':allowance, \n"
-"                'gross':basic + allowance, \n"
-"                'advantages_net':deduction,\n"
-"                'net':basic + allowance - deduction\n"
-"            }\n"
-"        return vals\n"
-"    \n"
-"    _columns = {\n"
-"        'passport_id':fields.many2one('hr.passport', 'Passport', "
-"required=False, domain=\"[('employee_id','=',active_id), "
-"('address_id','=',address_home_id)]\", help=\"Employee Passport Information"
-msgstr ""
-
 #. module: hr_payroll
 #: field:hr.payslip,leaves:0
 msgid "Leave Deductions"
@@ -663,13 +550,6 @@ msgstr ""
 msgid "No of Working days / week for an employee"
 msgstr ""
 
-#. module: hr_payroll
-#: 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: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
@@ -748,14 +628,6 @@ msgstr ""
 msgid "Fixed Amount"
 msgstr "Kindel summa"
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error : %s ' % (e)))\n"
-"                elif line.amount_type in ('fix', 'func"
-msgstr ""
-
 #. module: hr_payroll
 #: field:company.contribution.line,to_val:0
 #: report:employees.salary:0
@@ -764,11 +636,6 @@ msgstr ""
 msgid "To"
 msgstr "Kuni"
 
-#. module: hr_payroll
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
@@ -786,28 +653,6 @@ msgstr ""
 msgid "Pay Salary"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Please define bank account for the %s employee' % (slip.employee_id.name)))\n"
-"                pline = {\n"
-"                    'advice_id':pid,\n"
-"                    'name':slip.employee_id.bank_account_id.acc_number,\n"
-"                    'employee_id':slip.employee_id.id,\n"
-"                    'amount':slip.other_pay + slip.net,\n"
-"                    'bysal':slip.net\n"
-"                }\n"
-"                id = advice_line_pool.create(cr, uid, pline, "
-"context=context)\n"
-"\n"
-"        self.write(cr, uid, ids, {'state':'confirm'}, context=context)\n"
-"        return True\n"
-"\n"
-"    def process_sheet(self, cr, uid, ids, context=None):\n"
-"        slip_pool = self.pool.get('hr.payslip"
-msgstr ""
-
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,name:0
 msgid "Bank Account A/C"
@@ -984,11 +829,6 @@ msgstr ""
 msgid "Earnings"
 msgstr ""
 
-#. module: hr_payroll
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
@@ -1235,28 +1075,6 @@ msgstr ""
 msgid "Label"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error : %s ' % (e)))\n"
-"\n"
-"                if not calculate:\n"
-"                    continue\n"
-"\n"
-"                percent = 0.0\n"
-"                value = 0.0\n"
-"                base = False\n"
-"                company_contrib = 0.0\n"
-"                base = line.category_id.base\n"
-"\n"
-"                try:\n"
-"                    #Please have a look at the configuration guide.\n"
-"                    amt = eval(base, obj)\n"
-"                except Exception, e:\n"
-"                    raise osv.except_osv(_('Variable Error !"
-msgstr ""
-
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
 #: view:hr.payslip:0
@@ -1552,9 +1370,8 @@ msgid "Net Sal."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
+#: sql_constraint:hr.passport:0
+msgid "The Passport No must be unique !"
 msgstr ""
 
 #. module: hr_payroll
@@ -1687,6 +1504,12 @@ msgstr ""
 msgid "Payroll Configurtion"
 msgstr ""
 
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
 #. module: hr_payroll
 #: field:hr.passport,date_issue:0
 msgid "Passport Issue Date"
@@ -1740,6 +1563,12 @@ msgstr ""
 msgid "Letter Content"
 msgstr ""
 
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Year Salary"
+msgstr ""
+
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Allowance / Deduction"
@@ -1769,6 +1598,9 @@ msgstr "Kokku"
 msgid "Contributions"
 msgstr ""
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
+
 #~ msgid "Account"
 #~ msgstr "Konto"
 
@@ -1801,12 +1633,20 @@ msgstr ""
 #~ msgid "Miscelleanous"
 #~ msgstr "Mitmesugune"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Vigane XML vaate arhitektuurile!"
+
 #~ msgid "Expense"
 #~ msgstr "Kulu"
 
 #~ msgid "Payment Entries"
 #~ msgstr "Makse kirjed"
 
+#~ 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 "General Account"
 #~ msgstr "Üldine konto"
 
diff --git a/addons/hr_payroll/i18n/fr.po b/addons/hr_payroll/i18n/fr.po
index 10d0bc3f260..6b64e8df9d8 100644
--- a/addons/hr_payroll/i18n/fr.po
+++ b/addons/hr_payroll/i18n/fr.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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-24 09:28+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-11-25 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
@@ -51,11 +51,6 @@ msgstr "Détails sur le salaire des employés"
 msgid "Allowances with Basic:"
 msgstr ""
 
-#. module: hr_payroll
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_payroll
 #: report:employees.salary:0
 #: report:salary.structure:0
@@ -288,14 +283,6 @@ msgstr ""
 msgid "Employee Deduction"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error: %s ' % (e)))\n"
-"                elif line.amount_type in ('fix', 'func"
-msgstr ""
-
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
@@ -546,11 +533,6 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#. module: hr_payroll
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
@@ -568,12 +550,6 @@ msgstr ""
 msgid "No of Working days / week for an employee"
 msgstr ""
 
-#. module: hr_payroll
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
@@ -660,11 +636,6 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: hr_payroll
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
@@ -687,15 +658,6 @@ msgstr ""
 msgid "Bank Account A/C"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error: %s ' % (e)))\n"
-"\n"
-"                if sal_type in ('gross', 'net"
-msgstr ""
-
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Contribution Lines"
@@ -867,11 +829,6 @@ msgstr ""
 msgid "Earnings"
 msgstr ""
 
-#. module: hr_payroll
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
@@ -1226,11 +1183,6 @@ msgstr ""
 msgid "Current Month Date"
 msgstr ""
 
-#. module: hr_payroll
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Salary"
@@ -1412,37 +1364,14 @@ msgstr ""
 msgid "Wage Type"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error: %s ' % (e)))\n"
-"\n"
-"                if not calculate:\n"
-"                    continue\n"
-"\n"
-"                percent = 0.0\n"
-"                value = 0.0\n"
-"                base = False\n"
-"#                company_contrib = 0.0\n"
-"                base = line.category_id.base\n"
-"\n"
-"                try:\n"
-"                    #Please have a look at the configuration guide.\n"
-"                    amt = eval(base, obj)\n"
-"                except Exception, e:\n"
-"                    raise osv.except_osv(_('Variable Error !"
-msgstr ""
-
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Net Sal."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
+#: sql_constraint:hr.passport:0
+msgid "The Passport No must be unique !"
 msgstr ""
 
 #. module: hr_payroll
@@ -1634,6 +1563,12 @@ msgstr ""
 msgid "Letter Content"
 msgstr ""
 
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Year Salary"
+msgstr ""
+
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Allowance / Deduction"
@@ -1662,8 +1597,3 @@ msgstr ""
 #: field:hr.allounce.deduction.categoty,contribute_ids:0
 msgid "Contributions"
 msgstr ""
-
-#. module: hr_payroll
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
diff --git a/addons/hr_payroll/i18n/hr.po b/addons/hr_payroll/i18n/hr.po
index 9c8b3a0b5bf..59ddf601d07 100644
--- a/addons/hr_payroll/i18n/hr.po
+++ b/addons/hr_payroll/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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-29 10:21+0000\n"
 "Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@gmail.com>\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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
@@ -41,15 +41,6 @@ msgstr ""
 msgid "Recompute Sheet"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error : %s ' % (e)))\n"
-"\n"
-"                if sal_type in ('gross', 'net"
-msgstr ""
-
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Employees Salary Details"
@@ -60,11 +51,6 @@ msgstr ""
 msgid "Allowances with Basic:"
 msgstr ""
 
-#. module: hr_payroll
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Neispravan naziv modela u definiciji akcije"
-
 #. module: hr_payroll
 #: report:employees.salary:0
 #: report:salary.structure:0
@@ -158,6 +144,12 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Variable Error: %s "
+msgstr ""
+
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Expire"
@@ -168,83 +160,6 @@ msgstr ""
 msgid "Half-Pay Holiday"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Please check configuration of %s, payroll head is missing' % "
-"(hday.holiday_status_id.name)))\n"
-"                    \n"
-"                res = {\n"
-"                    'slip_id':slip.id,\n"
-"                    'name':hday.holiday_status_id.name + '-%s' % "
-"(hday.number_of_days),\n"
-"                    'code':hday.holiday_status_id.code,\n"
-"                    'amount_type':'fix',\n"
-"                    'category_id':hday.holiday_status_id.head_id.id,\n"
-"                    'sequence':hday.holiday_status_id.head_id.sequence\n"
-"                }\n"
-"                days = hday.number_of_days\n"
-"                if hday.number_of_days < 0:\n"
-"                    days = hday.number_of_days * -1\n"
-"                total_leave += days\n"
-"                if hday.holiday_status_id.type == 'paid':\n"
-"                    paid_leave += days\n"
-"                    continue\n"
-"#                    res['name'] = hday.holiday_status_id.name + '-%s' % "
-"(days)\n"
-"#                    res['amount'] = perday * days\n"
-"#                    res['type'] = 'allowance'\n"
-"#                    leave += days\n"
-"#                    total += perday * days\n"
-"                \n"
-"                elif hday.holiday_status_id.type == 'halfpaid':\n"
-"                    paid_leave += (days / 2)\n"
-"                    res['name'] = hday.holiday_status_id.name + '-%s/2' % "
-"(days)\n"
-"                    res['amount'] = perday * (days/2)\n"
-"                    total += perday * (days/2)\n"
-"                    leave += days / 2\n"
-"                    res['type'] = 'deduction'\n"
-"                else:\n"
-"                    res['name'] = hday.holiday_status_id.name + '-%s' % "
-"(days)\n"
-"                    res['amount'] = perday * days\n"
-"                    res['type'] = 'deduction'\n"
-"                    leave += days\n"
-"                    total += perday * days\n"
-"\n"
-"                slip_line_pool.create(cr, uid, res, context=context)\n"
-"            basic = basic - total\n"
-"            leaves = total\n"
-"            update.update({\n"
-"                'basic':basic,\n"
-"                'basic_before_leaves': round(basic_before_leaves),\n"
-"                'leaves':total,\n"
-"                'holiday_days':leave,\n"
-"                'worked_days':working_day - leave,\n"
-"                'working_days':working_day,\n"
-"            })\n"
-"            self.write(cr, uid, [slip.id], update, context=context)\n"
-"        return True\n"
-"hr_payslip()\n"
-"\n"
-"class hr_payslip_line(osv.osv):\n"
-"    '''\n"
-"    Payslip Line\n"
-"    '''\n"
-"    \n"
-"    _name = 'hr.payslip.line'\n"
-"    _description = 'Payslip Line'\n"
-"\n"
-"    def onchange_category(self, cr, uid, ids, category_id):\n"
-"        seq = 0\n"
-"        res = {\n"
-"        }\n"
-"        if category_id:\n"
-"            category = self.pool.get('hr.allounce.deduction.categoty"
-msgstr ""
-
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: field:hr.payslip,other_pay:0
@@ -341,6 +256,12 @@ msgstr ""
 msgid "Amount"
 msgstr "Iznos"
 
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please check configuration of %s, payroll head is missing"
+msgstr ""
+
 #. module: hr_payroll
 #: selection:company.contribution,amount_type:0
 msgid "Percentage"
@@ -520,40 +441,6 @@ msgstr "Datum završetka"
 msgid "Employee PaySlip"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error : %s ' % (e)))\n"
-"                amount = 0.0\n"
-"                if line.amount_type == 'per':\n"
-"                    amount = amt * line.amount\n"
-"                elif line.amount_type == 'func':\n"
-"                    amount = slip_line_pool.execute_function(cr, uid, "
-"line.id, amt, context)\n"
-"                elif line.amount_type == 'fix':\n"
-"                    amount = line.amount\n"
-"                \n"
-"                if line.type == 'allowance':\n"
-"                    allowance += amount\n"
-"                elif line.type == 'deduction':\n"
-"                    deduction += amount\n"
-"            \n"
-"            vals[employee.id] = {\n"
-"                'basic':basic, \n"
-"                'advantages_gross':allowance, \n"
-"                'gross':basic + allowance, \n"
-"                'advantages_net':deduction,\n"
-"                'net':basic + allowance - deduction\n"
-"            }\n"
-"        return vals\n"
-"    \n"
-"    _columns = {\n"
-"        'passport_id':fields.many2one('hr.passport', 'Passport', "
-"required=False, domain=\"[('employee_id','=',active_id), "
-"('address_id','=',address_home_id)]\", help=\"Employee Passport Information"
-msgstr ""
-
 #. module: hr_payroll
 #: field:hr.payslip,leaves:0
 msgid "Leave Deductions"
@@ -663,12 +550,6 @@ msgstr ""
 msgid "No of Working days / week for an employee"
 msgstr ""
 
-#. module: hr_payroll
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
@@ -747,14 +628,6 @@ msgstr ""
 msgid "Fixed Amount"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error : %s ' % (e)))\n"
-"                elif line.amount_type in ('fix', 'func"
-msgstr ""
-
 #. module: hr_payroll
 #: field:company.contribution.line,to_val:0
 #: report:employees.salary:0
@@ -763,11 +636,6 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: hr_payroll
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
@@ -785,28 +653,6 @@ msgstr ""
 msgid "Pay Salary"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Please define bank account for the %s employee' % (slip.employee_id.name)))\n"
-"                pline = {\n"
-"                    'advice_id':pid,\n"
-"                    'name':slip.employee_id.bank_account_id.acc_number,\n"
-"                    'employee_id':slip.employee_id.id,\n"
-"                    'amount':slip.other_pay + slip.net,\n"
-"                    'bysal':slip.net\n"
-"                }\n"
-"                id = advice_line_pool.create(cr, uid, pline, "
-"context=context)\n"
-"\n"
-"        self.write(cr, uid, ids, {'state':'confirm'}, context=context)\n"
-"        return True\n"
-"\n"
-"    def process_sheet(self, cr, uid, ids, context=None):\n"
-"        slip_pool = self.pool.get('hr.payslip"
-msgstr ""
-
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,name:0
 msgid "Bank Account A/C"
@@ -983,11 +829,6 @@ msgstr ""
 msgid "Earnings"
 msgstr ""
 
-#. module: hr_payroll
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
@@ -1234,28 +1075,6 @@ msgstr ""
 msgid "Label"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error : %s ' % (e)))\n"
-"\n"
-"                if not calculate:\n"
-"                    continue\n"
-"\n"
-"                percent = 0.0\n"
-"                value = 0.0\n"
-"                base = False\n"
-"                company_contrib = 0.0\n"
-"                base = line.category_id.base\n"
-"\n"
-"                try:\n"
-"                    #Please have a look at the configuration guide.\n"
-"                    amt = eval(base, obj)\n"
-"                except Exception, e:\n"
-"                    raise osv.except_osv(_('Variable Error !"
-msgstr ""
-
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
 #: view:hr.payslip:0
@@ -1551,9 +1370,8 @@ msgid "Net Sal."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
+#: sql_constraint:hr.passport:0
+msgid "The Passport No must be unique !"
 msgstr ""
 
 #. module: hr_payroll
@@ -1686,6 +1504,12 @@ msgstr ""
 msgid "Payroll Configurtion"
 msgstr ""
 
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
 #. module: hr_payroll
 #: field:hr.passport,date_issue:0
 msgid "Passport Issue Date"
@@ -1739,6 +1563,12 @@ msgstr ""
 msgid "Letter Content"
 msgstr ""
 
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Year Salary"
+msgstr ""
+
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Allowance / Deduction"
@@ -1771,6 +1601,9 @@ msgstr ""
 #~ msgid "Analytic Account for Salary Analysis"
 #~ msgstr "Analitički konto za analize plaće"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neispravan naziv modela u definiciji akcije"
+
 #~ msgid "Account"
 #~ msgstr "Konto"
 
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/it.po b/addons/hr_payroll/i18n/it.po
index ee190097dc8..43f511ba55e 100644
--- a/addons/hr_payroll/i18n/it.po
+++ b/addons/hr_payroll/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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-22 07:36+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-23 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
@@ -51,11 +51,6 @@ msgstr ""
 msgid "Allowances with Basic:"
 msgstr ""
 
-#. module: hr_payroll
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome del modello non valido nella definizione dell'azione."
-
 #. module: hr_payroll
 #: report:employees.salary:0
 #: report:salary.structure:0
@@ -290,14 +285,6 @@ msgstr ""
 msgid "Employee Deduction"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error: %s ' % (e)))\n"
-"                elif line.amount_type in ('fix', 'func"
-msgstr ""
-
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
@@ -548,11 +535,6 @@ msgstr "Tipo"
 msgid "Email"
 msgstr "Email"
 
-#. module: hr_payroll
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "L'ID certificato del modulo deve essere unico!"
-
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
@@ -570,14 +552,6 @@ msgstr ""
 msgid "No of Working days / week for an employee"
 msgstr ""
 
-#. module: hr_payroll
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per “x_” e non contenere alcun carattere "
-"speciale!"
-
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
@@ -664,11 +638,6 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: hr_payroll
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
@@ -691,15 +660,6 @@ msgstr ""
 msgid "Bank Account A/C"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error: %s ' % (e)))\n"
-"\n"
-"                if sal_type in ('gross', 'net"
-msgstr ""
-
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Contribution Lines"
@@ -871,11 +831,6 @@ msgstr ""
 msgid "Earnings"
 msgstr ""
 
-#. module: hr_payroll
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
@@ -1230,11 +1185,6 @@ msgstr ""
 msgid "Current Month Date"
 msgstr ""
 
-#. module: hr_payroll
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Salary"
@@ -1416,37 +1366,14 @@ msgstr ""
 msgid "Wage Type"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error: %s ' % (e)))\n"
-"\n"
-"                if not calculate:\n"
-"                    continue\n"
-"\n"
-"                percent = 0.0\n"
-"                value = 0.0\n"
-"                base = False\n"
-"#                company_contrib = 0.0\n"
-"                base = line.category_id.base\n"
-"\n"
-"                try:\n"
-"                    #Please have a look at the configuration guide.\n"
-"                    amt = eval(base, obj)\n"
-"                except Exception, e:\n"
-"                    raise osv.except_osv(_('Variable Error !"
-msgstr ""
-
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Net Sal."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
+#: sql_constraint:hr.passport:0
+msgid "The Passport No must be unique !"
 msgstr ""
 
 #. module: hr_payroll
@@ -1638,6 +1565,12 @@ msgstr ""
 msgid "Letter Content"
 msgstr ""
 
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Year Salary"
+msgstr ""
+
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Allowance / Deduction"
@@ -1667,7 +1600,14 @@ msgstr ""
 msgid "Contributions"
 msgstr ""
 
-#. module: hr_payroll
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome del modello non valido nella definizione dell'azione."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "L'ID certificato del modulo deve essere unico!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per “x_” e non contenere alcun carattere "
+#~ "speciale!"
diff --git a/addons/hr_payroll/i18n/mn.po b/addons/hr_payroll/i18n/mn.po
index 2d34e698d67..cd07ed105d0 100644
--- a/addons/hr_payroll/i18n/mn.po
+++ b/addons/hr_payroll/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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-28 08:59+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
@@ -41,15 +41,6 @@ msgstr "Цэвэр цалин"
 msgid "Recompute Sheet"
 msgstr "Цалингийн хуудсыг дахин тооцоолох"
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error : %s ' % (e)))\n"
-"\n"
-"                if sal_type in ('gross', 'net"
-msgstr "Хувьсагчийн алдаа : %s ' % (e)))"
-
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Employees Salary Details"
@@ -60,11 +51,6 @@ msgstr ""
 msgid "Allowances with Basic:"
 msgstr "Үндсэн цалингаас тооцсон олголтууд"
 
-#. module: hr_payroll
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
 #. module: hr_payroll
 #: report:employees.salary:0
 #: report:salary.structure:0
@@ -158,6 +144,12 @@ msgstr ","
 msgid "Set to Draft"
 msgstr "Ноороглох"
 
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Variable Error: %s "
+msgstr ""
+
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Expire"
@@ -168,83 +160,6 @@ msgstr "Дуусах огноо"
 msgid "Half-Pay Holiday"
 msgstr "Хагас цалинтай амралт, чөлөө"
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Please check configuration of %s, payroll head is missing' % "
-"(hday.holiday_status_id.name)))\n"
-"                    \n"
-"                res = {\n"
-"                    'slip_id':slip.id,\n"
-"                    'name':hday.holiday_status_id.name + '-%s' % "
-"(hday.number_of_days),\n"
-"                    'code':hday.holiday_status_id.code,\n"
-"                    'amount_type':'fix',\n"
-"                    'category_id':hday.holiday_status_id.head_id.id,\n"
-"                    'sequence':hday.holiday_status_id.head_id.sequence\n"
-"                }\n"
-"                days = hday.number_of_days\n"
-"                if hday.number_of_days < 0:\n"
-"                    days = hday.number_of_days * -1\n"
-"                total_leave += days\n"
-"                if hday.holiday_status_id.type == 'paid':\n"
-"                    paid_leave += days\n"
-"                    continue\n"
-"#                    res['name'] = hday.holiday_status_id.name + '-%s' % "
-"(days)\n"
-"#                    res['amount'] = perday * days\n"
-"#                    res['type'] = 'allowance'\n"
-"#                    leave += days\n"
-"#                    total += perday * days\n"
-"                \n"
-"                elif hday.holiday_status_id.type == 'halfpaid':\n"
-"                    paid_leave += (days / 2)\n"
-"                    res['name'] = hday.holiday_status_id.name + '-%s/2' % "
-"(days)\n"
-"                    res['amount'] = perday * (days/2)\n"
-"                    total += perday * (days/2)\n"
-"                    leave += days / 2\n"
-"                    res['type'] = 'deduction'\n"
-"                else:\n"
-"                    res['name'] = hday.holiday_status_id.name + '-%s' % "
-"(days)\n"
-"                    res['amount'] = perday * days\n"
-"                    res['type'] = 'deduction'\n"
-"                    leave += days\n"
-"                    total += perday * days\n"
-"\n"
-"                slip_line_pool.create(cr, uid, res, context=context)\n"
-"            basic = basic - total\n"
-"            leaves = total\n"
-"            update.update({\n"
-"                'basic':basic,\n"
-"                'basic_before_leaves': round(basic_before_leaves),\n"
-"                'leaves':total,\n"
-"                'holiday_days':leave,\n"
-"                'worked_days':working_day - leave,\n"
-"                'working_days':working_day,\n"
-"            })\n"
-"            self.write(cr, uid, [slip.id], update, context=context)\n"
-"        return True\n"
-"hr_payslip()\n"
-"\n"
-"class hr_payslip_line(osv.osv):\n"
-"    '''\n"
-"    Payslip Line\n"
-"    '''\n"
-"    \n"
-"    _name = 'hr.payslip.line'\n"
-"    _description = 'Payslip Line'\n"
-"\n"
-"    def onchange_category(self, cr, uid, ids, category_id):\n"
-"        seq = 0\n"
-"        res = {\n"
-"        }\n"
-"        if category_id:\n"
-"            category = self.pool.get('hr.allounce.deduction.categoty"
-msgstr ""
-
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: field:hr.payslip,other_pay:0
@@ -342,6 +257,12 @@ msgstr "Цалингин тооцоолол"
 msgid "Amount"
 msgstr "Дүн"
 
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please check configuration of %s, payroll head is missing"
+msgstr ""
+
 #. module: hr_payroll
 #: selection:company.contribution,amount_type:0
 msgid "Percentage"
@@ -532,40 +453,6 @@ msgstr "Дуусах огноо"
 msgid "Employee PaySlip"
 msgstr "Ажилтны цалингийн хуудас"
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error : %s ' % (e)))\n"
-"                amount = 0.0\n"
-"                if line.amount_type == 'per':\n"
-"                    amount = amt * line.amount\n"
-"                elif line.amount_type == 'func':\n"
-"                    amount = slip_line_pool.execute_function(cr, uid, "
-"line.id, amt, context)\n"
-"                elif line.amount_type == 'fix':\n"
-"                    amount = line.amount\n"
-"                \n"
-"                if line.type == 'allowance':\n"
-"                    allowance += amount\n"
-"                elif line.type == 'deduction':\n"
-"                    deduction += amount\n"
-"            \n"
-"            vals[employee.id] = {\n"
-"                'basic':basic, \n"
-"                'advantages_gross':allowance, \n"
-"                'gross':basic + allowance, \n"
-"                'advantages_net':deduction,\n"
-"                'net':basic + allowance - deduction\n"
-"            }\n"
-"        return vals\n"
-"    \n"
-"    _columns = {\n"
-"        'passport_id':fields.many2one('hr.passport', 'Passport', "
-"required=False, domain=\"[('employee_id','=',active_id), "
-"('address_id','=',address_home_id)]\", help=\"Employee Passport Information"
-msgstr ""
-
 #. module: hr_payroll
 #: field:hr.payslip,leaves:0
 msgid "Leave Deductions"
@@ -675,14 +562,6 @@ msgstr "Хуудсыг шалгах"
 msgid "No of Working days / week for an employee"
 msgstr "Ажилтны долоо хоногт ажиллах хоногийн тоо"
 
-#. module: hr_payroll
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-"болохгүй!"
-
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
@@ -761,14 +640,6 @@ msgstr "Ажилтнаарх бүгд"
 msgid "Fixed Amount"
 msgstr "Тогтмол дүн"
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error : %s ' % (e)))\n"
-"                elif line.amount_type in ('fix', 'func"
-msgstr ""
-
 #. module: hr_payroll
 #: field:company.contribution.line,to_val:0
 #: report:employees.salary:0
@@ -777,11 +648,6 @@ msgstr ""
 msgid "To"
 msgstr "Хэмжээ хүртэл"
 
-#. module: hr_payroll
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Харагдацын архитектурын xml буруу байна"
-
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
@@ -799,28 +665,6 @@ msgstr "Ажилчдын цалингийн дэлгэрэнгүй"
 msgid "Pay Salary"
 msgstr "Цалингийн хуудас"
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Please define bank account for the %s employee' % (slip.employee_id.name)))\n"
-"                pline = {\n"
-"                    'advice_id':pid,\n"
-"                    'name':slip.employee_id.bank_account_id.acc_number,\n"
-"                    'employee_id':slip.employee_id.id,\n"
-"                    'amount':slip.other_pay + slip.net,\n"
-"                    'bysal':slip.net\n"
-"                }\n"
-"                id = advice_line_pool.create(cr, uid, pline, "
-"context=context)\n"
-"\n"
-"        self.write(cr, uid, ids, {'state':'confirm'}, context=context)\n"
-"        return True\n"
-"\n"
-"    def process_sheet(self, cr, uid, ids, context=None):\n"
-"        slip_pool = self.pool.get('hr.payslip"
-msgstr ""
-
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,name:0
 msgid "Bank Account A/C"
@@ -997,11 +841,6 @@ msgstr "Ноорог"
 msgid "Earnings"
 msgstr "Цалингийн орлого"
 
-#. module: hr_payroll
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Алдаа! Рекурс цэс үүсгэж болохгүй"
-
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
@@ -1248,28 +1087,6 @@ msgstr "Ажил олгогчийн даах суутгал"
 msgid "Label"
 msgstr "Шошго"
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error : %s ' % (e)))\n"
-"\n"
-"                if not calculate:\n"
-"                    continue\n"
-"\n"
-"                percent = 0.0\n"
-"                value = 0.0\n"
-"                base = False\n"
-"                company_contrib = 0.0\n"
-"                base = line.category_id.base\n"
-"\n"
-"                try:\n"
-"                    #Please have a look at the configuration guide.\n"
-"                    amt = eval(base, obj)\n"
-"                except Exception, e:\n"
-"                    raise osv.except_osv(_('Variable Error !"
-msgstr ""
-
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
 #: view:hr.payslip:0
@@ -1571,10 +1388,9 @@ msgid "Net Sal."
 msgstr "Цэвэр уалин."
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Жилийн цалин"
+#: sql_constraint:hr.passport:0
+msgid "The Passport No must be unique !"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
@@ -1706,6 +1522,12 @@ msgstr "Компанийн суутгал"
 msgid "Payroll Configurtion"
 msgstr "Цалингийн тохиргоо"
 
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
 #. module: hr_payroll
 #: field:hr.passport,date_issue:0
 msgid "Passport Issue Date"
@@ -1759,6 +1581,12 @@ msgstr "Ажилтны цалингийн хуудас"
 msgid "Letter Content"
 msgstr "Захидлын агуулга"
 
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Year Salary"
+msgstr "Жилийн цалин"
+
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Allowance / Deduction"
@@ -1788,6 +1616,9 @@ msgstr "Нийт"
 msgid "Contributions"
 msgstr "Ажил олгогчийн даах суутгал"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+
 #~ msgid "Calculations Rules"
 #~ msgstr "Тооцоолох дүрмүүд"
 
@@ -1847,6 +1678,12 @@ msgstr "Ажил олгогчийн даах суутгал"
 #~ msgid "Total SAL"
 #~ msgstr "Нийт цалин"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+#~ "болохгүй!"
+
 #~ msgid "Bank Journal"
 #~ msgstr "Банкны журнал"
 
@@ -1926,3 +1763,31 @@ msgstr "Ажил олгогчийн даах суутгал"
 
 #~ msgid "Employee Payable Account"
 #~ msgstr "Ажилтны өглөгийн данс"
+
+#~ msgid "Payment From"
+#~ msgstr "Төлөгч"
+
+#~ msgid "Analytic Account"
+#~ msgstr "Аналитик данс"
+
+#~ msgid "Expanse Entries"
+#~ msgstr "Бичлэгүүдийг задлах"
+
+#~ msgid "ESI Account"
+#~ msgstr "ESI данс"
+
+#~ msgid "Unite"
+#~ msgstr "Нэгтгэх"
+
+#, python-format
+#~ msgid ""
+#~ "Variable Error : %s ' % (e)))\n"
+#~ "\n"
+#~ "                if sal_type in ('gross', 'net"
+#~ msgstr "Хувьсагчийн алдаа : %s ' % (e)))"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Харагдацын архитектурын xml буруу байна"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Алдаа! Рекурс цэс үүсгэж болохгүй"
diff --git a/addons/hr_payroll/i18n/pl.po b/addons/hr_payroll/i18n/pl.po
index a60bf661314..26adf97da93 100644
--- a/addons/hr_payroll/i18n/pl.po
+++ b/addons/hr_payroll/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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-29 09:05+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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
@@ -41,15 +41,6 @@ msgstr "Wynagrodzenie netto"
 msgid "Recompute Sheet"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error : %s ' % (e)))\n"
-"\n"
-"                if sal_type in ('gross', 'net"
-msgstr ""
-
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Employees Salary Details"
@@ -60,11 +51,6 @@ msgstr "Szczegóły wynagrodzenia"
 msgid "Allowances with Basic:"
 msgstr ""
 
-#. module: hr_payroll
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
 #. module: hr_payroll
 #: report:employees.salary:0
 #: report:salary.structure:0
@@ -158,6 +144,12 @@ msgstr ""
 msgid "Set to Draft"
 msgstr "Ustaw na projekt"
 
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Variable Error: %s "
+msgstr ""
+
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Expire"
@@ -168,83 +160,6 @@ msgstr ""
 msgid "Half-Pay Holiday"
 msgstr "Urlop półpłatny"
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Please check configuration of %s, payroll head is missing' % "
-"(hday.holiday_status_id.name)))\n"
-"                    \n"
-"                res = {\n"
-"                    'slip_id':slip.id,\n"
-"                    'name':hday.holiday_status_id.name + '-%s' % "
-"(hday.number_of_days),\n"
-"                    'code':hday.holiday_status_id.code,\n"
-"                    'amount_type':'fix',\n"
-"                    'category_id':hday.holiday_status_id.head_id.id,\n"
-"                    'sequence':hday.holiday_status_id.head_id.sequence\n"
-"                }\n"
-"                days = hday.number_of_days\n"
-"                if hday.number_of_days < 0:\n"
-"                    days = hday.number_of_days * -1\n"
-"                total_leave += days\n"
-"                if hday.holiday_status_id.type == 'paid':\n"
-"                    paid_leave += days\n"
-"                    continue\n"
-"#                    res['name'] = hday.holiday_status_id.name + '-%s' % "
-"(days)\n"
-"#                    res['amount'] = perday * days\n"
-"#                    res['type'] = 'allowance'\n"
-"#                    leave += days\n"
-"#                    total += perday * days\n"
-"                \n"
-"                elif hday.holiday_status_id.type == 'halfpaid':\n"
-"                    paid_leave += (days / 2)\n"
-"                    res['name'] = hday.holiday_status_id.name + '-%s/2' % "
-"(days)\n"
-"                    res['amount'] = perday * (days/2)\n"
-"                    total += perday * (days/2)\n"
-"                    leave += days / 2\n"
-"                    res['type'] = 'deduction'\n"
-"                else:\n"
-"                    res['name'] = hday.holiday_status_id.name + '-%s' % "
-"(days)\n"
-"                    res['amount'] = perday * days\n"
-"                    res['type'] = 'deduction'\n"
-"                    leave += days\n"
-"                    total += perday * days\n"
-"\n"
-"                slip_line_pool.create(cr, uid, res, context=context)\n"
-"            basic = basic - total\n"
-"            leaves = total\n"
-"            update.update({\n"
-"                'basic':basic,\n"
-"                'basic_before_leaves': round(basic_before_leaves),\n"
-"                'leaves':total,\n"
-"                'holiday_days':leave,\n"
-"                'worked_days':working_day - leave,\n"
-"                'working_days':working_day,\n"
-"            })\n"
-"            self.write(cr, uid, [slip.id], update, context=context)\n"
-"        return True\n"
-"hr_payslip()\n"
-"\n"
-"class hr_payslip_line(osv.osv):\n"
-"    '''\n"
-"    Payslip Line\n"
-"    '''\n"
-"    \n"
-"    _name = 'hr.payslip.line'\n"
-"    _description = 'Payslip Line'\n"
-"\n"
-"    def onchange_category(self, cr, uid, ids, category_id):\n"
-"        seq = 0\n"
-"        res = {\n"
-"        }\n"
-"        if category_id:\n"
-"            category = self.pool.get('hr.allounce.deduction.categoty"
-msgstr ""
-
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: field:hr.payslip,other_pay:0
@@ -341,6 +256,12 @@ msgstr ""
 msgid "Amount"
 msgstr "Kwota"
 
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please check configuration of %s, payroll head is missing"
+msgstr ""
+
 #. module: hr_payroll
 #: selection:company.contribution,amount_type:0
 msgid "Percentage"
@@ -520,40 +441,6 @@ msgstr "Data końcowa"
 msgid "Employee PaySlip"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error : %s ' % (e)))\n"
-"                amount = 0.0\n"
-"                if line.amount_type == 'per':\n"
-"                    amount = amt * line.amount\n"
-"                elif line.amount_type == 'func':\n"
-"                    amount = slip_line_pool.execute_function(cr, uid, "
-"line.id, amt, context)\n"
-"                elif line.amount_type == 'fix':\n"
-"                    amount = line.amount\n"
-"                \n"
-"                if line.type == 'allowance':\n"
-"                    allowance += amount\n"
-"                elif line.type == 'deduction':\n"
-"                    deduction += amount\n"
-"            \n"
-"            vals[employee.id] = {\n"
-"                'basic':basic, \n"
-"                'advantages_gross':allowance, \n"
-"                'gross':basic + allowance, \n"
-"                'advantages_net':deduction,\n"
-"                'net':basic + allowance - deduction\n"
-"            }\n"
-"        return vals\n"
-"    \n"
-"    _columns = {\n"
-"        'passport_id':fields.many2one('hr.passport', 'Passport', "
-"required=False, domain=\"[('employee_id','=',active_id), "
-"('address_id','=',address_home_id)]\", help=\"Employee Passport Information"
-msgstr ""
-
 #. module: hr_payroll
 #: field:hr.payslip,leaves:0
 msgid "Leave Deductions"
@@ -663,14 +550,6 @@ msgstr ""
 msgid "No of Working days / week for an employee"
 msgstr ""
 
-#. module: hr_payroll
-#: 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: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
@@ -749,14 +628,6 @@ msgstr ""
 msgid "Fixed Amount"
 msgstr "Kwota stała"
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error : %s ' % (e)))\n"
-"                elif line.amount_type in ('fix', 'func"
-msgstr ""
-
 #. module: hr_payroll
 #: field:company.contribution.line,to_val:0
 #: report:employees.salary:0
@@ -765,11 +636,6 @@ msgstr ""
 msgid "To"
 msgstr "Do"
 
-#. module: hr_payroll
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Niewłaściwy XML dla architektury widoku!"
-
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
@@ -787,28 +653,6 @@ msgstr ""
 msgid "Pay Salary"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Please define bank account for the %s employee' % (slip.employee_id.name)))\n"
-"                pline = {\n"
-"                    'advice_id':pid,\n"
-"                    'name':slip.employee_id.bank_account_id.acc_number,\n"
-"                    'employee_id':slip.employee_id.id,\n"
-"                    'amount':slip.other_pay + slip.net,\n"
-"                    'bysal':slip.net\n"
-"                }\n"
-"                id = advice_line_pool.create(cr, uid, pline, "
-"context=context)\n"
-"\n"
-"        self.write(cr, uid, ids, {'state':'confirm'}, context=context)\n"
-"        return True\n"
-"\n"
-"    def process_sheet(self, cr, uid, ids, context=None):\n"
-"        slip_pool = self.pool.get('hr.payslip"
-msgstr ""
-
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,name:0
 msgid "Bank Account A/C"
@@ -985,11 +829,6 @@ msgstr ""
 msgid "Earnings"
 msgstr ""
 
-#. module: hr_payroll
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
@@ -1236,28 +1075,6 @@ msgstr ""
 msgid "Label"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error : %s ' % (e)))\n"
-"\n"
-"                if not calculate:\n"
-"                    continue\n"
-"\n"
-"                percent = 0.0\n"
-"                value = 0.0\n"
-"                base = False\n"
-"                company_contrib = 0.0\n"
-"                base = line.category_id.base\n"
-"\n"
-"                try:\n"
-"                    #Please have a look at the configuration guide.\n"
-"                    amt = eval(base, obj)\n"
-"                except Exception, e:\n"
-"                    raise osv.except_osv(_('Variable Error !"
-msgstr ""
-
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
 #: view:hr.payslip:0
@@ -1553,10 +1370,9 @@ msgid "Net Sal."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Wynagrodzenie roczne"
+#: sql_constraint:hr.passport:0
+msgid "The Passport No must be unique !"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
@@ -1688,6 +1504,12 @@ msgstr ""
 msgid "Payroll Configurtion"
 msgstr "Konfiguracja listy płac"
 
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
 #. module: hr_payroll
 #: field:hr.passport,date_issue:0
 msgid "Passport Issue Date"
@@ -1741,6 +1563,12 @@ msgstr ""
 msgid "Letter Content"
 msgstr "Zawartość listu"
 
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Year Salary"
+msgstr "Wynagrodzenie roczne"
+
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Allowance / Deduction"
@@ -1776,6 +1604,9 @@ msgstr ""
 #~ msgid "(Based on type Payroll will calculate basic salary)"
 #~ msgstr "(Oparty na Liście płac do obliczeń podstawowych wynagrodzeń)"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
 #~ msgid "Employee No"
 #~ msgstr "Nr pracownika"
 
@@ -1814,12 +1645,21 @@ msgstr ""
 #~ msgid "Print"
 #~ msgstr "Drukuj"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Niewłaściwy XML dla architektury widoku!"
+
 #~ msgid "Expense"
 #~ msgstr "Wydatek"
 
 #~ msgid "Payment Entries"
 #~ msgstr "Zapisy płatności"
 
+#~ 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 "Bank Journal"
 #~ msgstr "Dziennik bankowy"
 
diff --git a/addons/hr_payroll/i18n/pt.po b/addons/hr_payroll/i18n/pt.po
index 78b3f41cae0..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-12 10:02+0000\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-14 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
@@ -83,7 +83,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Salary Payment Register"
-msgstr ""
+msgstr "Registo de pagamento de salário"
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
@@ -176,7 +176,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Contract Detail:"
-msgstr ""
+msgstr "Detalhes do contrato:"
 
 #. module: hr_payroll
 #: field:hr.payslip,igross:0
@@ -188,7 +188,7 @@ msgstr ""
 #: help:hr.payroll.advice,bank_id:0
 #: help:hr.payroll.register,bank_id:0
 msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr ""
+msgstr "Selecione o banco de onde será feito o pagamento do salário"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
@@ -227,7 +227,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Total Deductions"
-msgstr ""
+msgstr "Total de deduções"
 
 #. module: hr_payroll
 #: field:company.contribution.line,value:0
@@ -288,7 +288,7 @@ msgstr ""
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Other Deduction"
-msgstr ""
+msgstr "Outras deduções"
 
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
@@ -306,7 +306,7 @@ msgstr "Agrupar por..."
 #. module: hr_payroll
 #: field:hr.passport,date_expire:0
 msgid "Passport Expire Date"
-msgstr ""
+msgstr "Data de expiração do passaporte"
 
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
@@ -347,7 +347,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Identification No"
-msgstr ""
+msgstr "Número de identificação"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
@@ -409,12 +409,12 @@ msgstr "Subtotal"
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Payments -"
-msgstr ""
+msgstr "Pagamentos -"
 
 #. module: hr_payroll
 #: field:hr.contract,visa_no:0
 msgid "Visa No"
-msgstr ""
+msgstr "Número de visto"
 
 #. module: hr_payroll
 #: field:company.contribution.line,from_val:0
@@ -422,20 +422,20 @@ msgstr ""
 #: field:hr.payslip.line.line,from_val:0
 #: report:year.salary:0
 msgid "From"
-msgstr ""
+msgstr "De"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
 #: report:payroll.advice:0
 msgid "By Salary"
-msgstr ""
+msgstr "Por salário"
 
 #. module: hr_payroll
 #: field:hr.payroll.employees.detail,date_to:0
 #: field:hr.payroll.year.salary,date_to:0
 #: report:salary.structure:0
 msgid "End Date"
-msgstr ""
+msgstr "Data de fim"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
@@ -473,7 +473,7 @@ msgstr "Notas:"
 #: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
@@ -498,7 +498,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
 msgid "Company Contributions"
-msgstr ""
+msgstr "Contribuições da empresa"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,employee_id:0
@@ -508,12 +508,12 @@ msgstr ""
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
 msgid "Employee"
-msgstr ""
+msgstr "Empregado"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,base:0
 msgid "Formula"
-msgstr ""
+msgstr "Fórmula"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
@@ -527,7 +527,7 @@ msgstr ""
 #: field:hr.payslip.line,type:0
 #: report:salary.structure:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -549,7 +549,7 @@ msgstr ""
 #. module: hr_payroll
 #: help:hr.contract,working_days_per_week:0
 msgid "No of Working days / week for an employee"
-msgstr ""
+msgstr "Número de dias de trabalho semanais para um empregado"
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
@@ -569,12 +569,12 @@ msgstr ""
 #: field:hr.payslip,grows:0
 #: report:salary.structure:0
 msgid "Gross Salary"
-msgstr ""
+msgstr "Salário bruto"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Total Earnings"
-msgstr ""
+msgstr "Total de ganhos"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
@@ -586,7 +586,7 @@ msgstr ""
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Other Payment"
-msgstr ""
+msgstr "Outros pagamentos"
 
 #. module: hr_payroll
 #: field:hr.employee,advantages_net:0
@@ -603,12 +603,12 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.contract,permit_no:0
 msgid "Work Permit No"
-msgstr ""
+msgstr "Licença de trabalho nº"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,line_ids:0
 msgid "Employee Salary"
-msgstr ""
+msgstr "Salário do empregado"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,chaque_nos:0
@@ -618,7 +618,7 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.contibution.register,monthly_total_by_emp:0
 msgid "Total By Employee"
-msgstr ""
+msgstr "Total por empregado"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -627,7 +627,7 @@ msgstr ""
 #: selection:hr.payslip.line,amount_type:0
 #: selection:hr.payslip.line.line,amount_type:0
 msgid "Fixed Amount"
-msgstr ""
+msgstr "Montante fixo"
 
 #. module: hr_payroll
 #: field:company.contribution.line,to_val:0
@@ -635,24 +635,24 @@ msgstr ""
 #: field:hr.payslip.line.line,to_val:0
 #: report:year.salary:0
 msgid "To"
-msgstr ""
+msgstr "Para"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
 msgid "Variable Error !"
-msgstr ""
+msgstr "Erro de variável!"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
 msgid "hr.payroll.employees.detail"
-msgstr ""
+msgstr "hr.payroll.employees.detail"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Pay Salary"
-msgstr ""
+msgstr "Pagar salário"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,name:0
@@ -667,7 +667,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "For the month of"
-msgstr ""
+msgstr "Para o mês de"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
@@ -725,7 +725,7 @@ msgstr "Montante líquido"
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Salary Structure:"
-msgstr ""
+msgstr "Estrutura do salário:"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
@@ -765,7 +765,7 @@ msgstr "Dias de trabalho"
 #. module: hr_payroll
 #: field:hr.contibution.register,monthly_total_by_comp:0
 msgid "Total By Company"
-msgstr ""
+msgstr "Total por empresa"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,flag:0
@@ -808,7 +808,7 @@ msgstr "Categoria"
 #: field:hr.payslip.line,company_contrib:0
 #: model:ir.model,name:hr_payroll.model_company_contribution
 msgid "Company Contribution"
-msgstr ""
+msgstr "Contribuição da empresa"
 
 #. module: hr_payroll
 #: field:company.contribution,category_id:0
@@ -876,7 +876,7 @@ msgstr ""
 #: report:hr.payroll.register.sheet:0
 #: report:payroll.advice:0
 msgid "For"
-msgstr ""
+msgstr "Para"
 
 #. module: hr_payroll
 #: view:hr.passport:0
@@ -982,12 +982,12 @@ msgstr ""
 #: report:payslip.pdf:0
 #: report:salary.structure:0
 msgid "Designation"
-msgstr ""
+msgstr "Designação"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "HR Manager"
-msgstr ""
+msgstr "Gestor de RH"
 
 #. module: hr_payroll
 #: field:hr.contract,basic:0
@@ -995,12 +995,12 @@ msgstr ""
 #: field:hr.payslip,basic_before_leaves:0
 #: report:payslip.pdf:0
 msgid "Basic Salary"
-msgstr ""
+msgstr "Salário base"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
 msgid "Categoty Code"
-msgstr ""
+msgstr "Código de categoria"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
@@ -1049,12 +1049,12 @@ msgstr "Data"
 #. module: hr_payroll
 #: field:hr.contract,visa_expire:0
 msgid "Visa Expire Date"
-msgstr ""
+msgstr "Data de expiração do visto"
 
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Search Passport"
-msgstr ""
+msgstr "Procurar passaporte"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1081,7 +1081,7 @@ msgstr ""
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
 msgid "Company contribution"
-msgstr ""
+msgstr "Contribuição da empresa"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1109,7 +1109,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Number :"
-msgstr ""
+msgstr "Número:"
 
 #. module: hr_payroll
 #: help:hr.allounce.deduction.categoty,base:0
@@ -1148,7 +1148,7 @@ msgstr "Número"
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
-msgstr ""
+msgstr "Estrutura do salário"
 
 #. module: hr_payroll
 #: field:hr.contibution.register,register_line_ids:0
@@ -1159,13 +1159,13 @@ msgstr ""
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: hr_payroll
 #: view:hr.payroll.employees.detail:0
 #: view:hr.payroll.year.salary:0
 msgid "Close"
-msgstr ""
+msgstr "Fechar"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,amount:0
@@ -1182,7 +1182,7 @@ msgstr ""
 #. module: hr_payroll
 #: selection:hr.payroll.year.salary,salary_on:0
 msgid "Current Month Date"
-msgstr ""
+msgstr "Data atual"
 
 #. module: hr_payroll
 #: report:salary.structure:0
@@ -1203,7 +1203,7 @@ msgstr "Passaporte"
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Total Salary"
-msgstr ""
+msgstr "Salário total"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
@@ -1237,7 +1237,7 @@ msgstr ""
 #: view:hr.payroll.employees.detail:0
 #: view:hr.payroll.year.salary:0
 msgid "Print Report"
-msgstr ""
+msgstr "Imprimir relatório"
 
 #. module: hr_payroll
 #: field:company.contribution,line_ids:0
@@ -1246,7 +1246,7 @@ msgstr ""
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
-msgstr ""
+msgstr "Cálculos"
 
 #. module: hr_payroll
 #: help:company.contribution,contribute_per:0
@@ -1289,12 +1289,12 @@ msgstr ""
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,function_id:0
 msgid "Function"
-msgstr ""
+msgstr "Função"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "States"
-msgstr ""
+msgstr "Estados"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
@@ -1329,14 +1329,14 @@ msgstr "Salário bruto"
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
 msgid "Description"
-msgstr ""
+msgstr "Descrição"
 
 #. module: hr_payroll
 #: field:hr.payroll.employees.detail,date_from:0
 #: field:hr.payroll.year.salary,date_from:0
 #: report:salary.structure:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data de início"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -1346,7 +1346,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: hr_payroll
 #: view:hr.contibution.register:0
@@ -1363,7 +1363,7 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
 msgid "Wage Type"
-msgstr ""
+msgstr "Tipo do salário"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -1373,17 +1373,17 @@ msgstr "Salário líquido"
 #. module: hr_payroll
 #: sql_constraint:hr.passport:0
 msgid "The Passport No must be unique !"
-msgstr ""
+msgstr "O número de passaporte deve ser único!"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
 msgid "Categoty Name"
-msgstr ""
+msgstr "Nome da categoria"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
 msgid "hr.payroll.year.salary"
-msgstr ""
+msgstr "hr.payroll.year.salary"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1482,7 +1482,7 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.payslip,total_pay:0
 msgid "Total Payment"
-msgstr ""
+msgstr "Pagamento total"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -1597,7 +1597,7 @@ msgstr "Total"
 #: view:hr.allounce.deduction.categoty:0
 #: field:hr.allounce.deduction.categoty,contribute_ids:0
 msgid "Contributions"
-msgstr ""
+msgstr "Contribuições"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de modelo inválido na definição da acção."
diff --git a/addons/hr_payroll/i18n/ru.po b/addons/hr_payroll/i18n/ru.po
index 8330626bd6b..5d4de1ec03d 100644
--- a/addons/hr_payroll/i18n/ru.po
+++ b/addons/hr_payroll/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-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-29 07:46+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-30 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
@@ -51,11 +51,6 @@ msgstr "Детали заработной платы"
 msgid "Allowances with Basic:"
 msgstr ""
 
-#. module: hr_payroll
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
 #. module: hr_payroll
 #: report:employees.salary:0
 #: report:salary.structure:0
@@ -288,14 +283,6 @@ msgstr "Страна выдачи"
 msgid "Employee Deduction"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error: %s ' % (e)))\n"
-"                elif line.amount_type in ('fix', 'func"
-msgstr ""
-
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
@@ -546,11 +533,6 @@ msgstr "Тип"
 msgid "Email"
 msgstr "Эл. почта"
 
-#. module: hr_payroll
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
@@ -568,14 +550,6 @@ msgstr "Лист сверки"
 msgid "No of Working days / week for an employee"
 msgstr ""
 
-#. module: hr_payroll
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Имя Объекта должно начинаться с x_ и не должно содержать специальных "
-"символов!"
-
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
@@ -662,11 +636,6 @@ msgstr "Фиксированная величина"
 msgid "To"
 msgstr "Кому"
 
-#. module: hr_payroll
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Некорректный формат XML для структуры вида!"
-
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
@@ -689,15 +658,6 @@ msgstr "Начисление зарплаты"
 msgid "Bank Account A/C"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error: %s ' % (e)))\n"
-"\n"
-"                if sal_type in ('gross', 'net"
-msgstr ""
-
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Contribution Lines"
@@ -869,11 +829,6 @@ msgstr "Черновик"
 msgid "Earnings"
 msgstr "Сборы"
 
-#. module: hr_payroll
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
@@ -1228,11 +1183,6 @@ msgstr "Доплаты"
 msgid "Current Month Date"
 msgstr ""
 
-#. module: hr_payroll
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Размер поля не может быть меньше 1 !"
-
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Salary"
@@ -1414,38 +1364,15 @@ msgstr "Платежная ведомость"
 msgid "Wage Type"
 msgstr "Тип зарплаты"
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error: %s ' % (e)))\n"
-"\n"
-"                if not calculate:\n"
-"                    continue\n"
-"\n"
-"                percent = 0.0\n"
-"                value = 0.0\n"
-"                base = False\n"
-"#                company_contrib = 0.0\n"
-"                base = line.category_id.base\n"
-"\n"
-"                try:\n"
-"                    #Please have a look at the configuration guide.\n"
-"                    amt = eval(base, obj)\n"
-"                except Exception, e:\n"
-"                    raise osv.except_osv(_('Variable Error !"
-msgstr ""
-
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Net Sal."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Годовая зарплата"
+#: sql_constraint:hr.passport:0
+msgid "The Passport No must be unique !"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
@@ -1636,6 +1563,12 @@ msgstr ""
 msgid "Letter Content"
 msgstr ""
 
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Year Salary"
+msgstr "Годовая зарплата"
+
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Allowance / Deduction"
@@ -1665,10 +1598,8 @@ msgstr "Всего"
 msgid "Contributions"
 msgstr "При участии"
 
-#. module: hr_payroll
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Недопустимое имя модели в определении действия."
 
 #~ msgid "Analytic Account for Salary Analysis"
 #~ msgstr "Аналитический счет для анализа заработной платы"
@@ -1746,6 +1677,9 @@ msgstr ""
 #~ msgid "Please defined the Partner in Home Address !!"
 #~ msgstr "Пожалуйста, задайте Партнера через домашний адрес!!"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Некорректный формат XML для структуры вида!"
+
 #~ msgid "Account Lines"
 #~ msgstr "Строки счета"
 
@@ -1770,6 +1704,12 @@ msgstr ""
 #~ msgid "Bank Journal"
 #~ msgstr "Банковский журнал"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Имя Объекта должно начинаться с x_ и не должно содержать специальных "
+#~ "символов!"
+
 #~ msgid "Salary Account"
 #~ msgstr "Зарплатный счет"
 
@@ -1826,3 +1766,12 @@ msgstr ""
 
 #~ msgid "Select Bank Account from where Salary Expanse will be Paid"
 #~ msgstr "Выберите банковский счет для списания зарплаты"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Размер поля не может быть меньше 1 !"
diff --git a/addons/hr_payroll/i18n/sr@latin.po b/addons/hr_payroll/i18n/sr@latin.po
index 9fddb868472..1ce0bbaa6f6 100644
--- a/addons/hr_payroll/i18n/sr@latin.po
+++ b/addons/hr_payroll/i18n/sr@latin.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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
diff --git a/addons/hr_payroll/i18n/sv.po b/addons/hr_payroll/i18n/sv.po
index d1aa313d67a..49119934e51 100644
--- a/addons/hr_payroll/i18n/sv.po
+++ b/addons/hr_payroll/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-14 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
diff --git a/addons/hr_payroll/i18n/zh_CN.po b/addons/hr_payroll/i18n/zh_CN.po
index 0516c545c22..5a687994278 100644
--- a/addons/hr_payroll/i18n/zh_CN.po
+++ b/addons/hr_payroll/i18n/zh_CN.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-07-20 16:01+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\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-10-30 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
@@ -41,15 +41,6 @@ msgstr "净薪酬"
 msgid "Recompute Sheet"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error : %s ' % (e)))\n"
-"\n"
-"                if sal_type in ('gross', 'net"
-msgstr ""
-
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Employees Salary Details"
@@ -60,11 +51,6 @@ msgstr "员工薪酬细节"
 msgid "Allowances with Basic:"
 msgstr "基本免税额:"
 
-#. module: hr_payroll
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "在动作定义中使用了无效的模快名。"
-
 #. module: hr_payroll
 #: report:employees.salary:0
 #: report:salary.structure:0
@@ -158,6 +144,12 @@ msgstr ","
 msgid "Set to Draft"
 msgstr "设为草稿"
 
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Variable Error: %s "
+msgstr ""
+
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Expire"
@@ -168,83 +160,6 @@ msgstr ""
 msgid "Half-Pay Holiday"
 msgstr "半薪假期"
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Please check configuration of %s, payroll head is missing' % "
-"(hday.holiday_status_id.name)))\n"
-"                    \n"
-"                res = {\n"
-"                    'slip_id':slip.id,\n"
-"                    'name':hday.holiday_status_id.name + '-%s' % "
-"(hday.number_of_days),\n"
-"                    'code':hday.holiday_status_id.code,\n"
-"                    'amount_type':'fix',\n"
-"                    'category_id':hday.holiday_status_id.head_id.id,\n"
-"                    'sequence':hday.holiday_status_id.head_id.sequence\n"
-"                }\n"
-"                days = hday.number_of_days\n"
-"                if hday.number_of_days < 0:\n"
-"                    days = hday.number_of_days * -1\n"
-"                total_leave += days\n"
-"                if hday.holiday_status_id.type == 'paid':\n"
-"                    paid_leave += days\n"
-"                    continue\n"
-"#                    res['name'] = hday.holiday_status_id.name + '-%s' % "
-"(days)\n"
-"#                    res['amount'] = perday * days\n"
-"#                    res['type'] = 'allowance'\n"
-"#                    leave += days\n"
-"#                    total += perday * days\n"
-"                \n"
-"                elif hday.holiday_status_id.type == 'halfpaid':\n"
-"                    paid_leave += (days / 2)\n"
-"                    res['name'] = hday.holiday_status_id.name + '-%s/2' % "
-"(days)\n"
-"                    res['amount'] = perday * (days/2)\n"
-"                    total += perday * (days/2)\n"
-"                    leave += days / 2\n"
-"                    res['type'] = 'deduction'\n"
-"                else:\n"
-"                    res['name'] = hday.holiday_status_id.name + '-%s' % "
-"(days)\n"
-"                    res['amount'] = perday * days\n"
-"                    res['type'] = 'deduction'\n"
-"                    leave += days\n"
-"                    total += perday * days\n"
-"\n"
-"                slip_line_pool.create(cr, uid, res, context=context)\n"
-"            basic = basic - total\n"
-"            leaves = total\n"
-"            update.update({\n"
-"                'basic':basic,\n"
-"                'basic_before_leaves': round(basic_before_leaves),\n"
-"                'leaves':total,\n"
-"                'holiday_days':leave,\n"
-"                'worked_days':working_day - leave,\n"
-"                'working_days':working_day,\n"
-"            })\n"
-"            self.write(cr, uid, [slip.id], update, context=context)\n"
-"        return True\n"
-"hr_payslip()\n"
-"\n"
-"class hr_payslip_line(osv.osv):\n"
-"    '''\n"
-"    Payslip Line\n"
-"    '''\n"
-"    \n"
-"    _name = 'hr.payslip.line'\n"
-"    _description = 'Payslip Line'\n"
-"\n"
-"    def onchange_category(self, cr, uid, ids, category_id):\n"
-"        seq = 0\n"
-"        res = {\n"
-"        }\n"
-"        if category_id:\n"
-"            category = self.pool.get('hr.allounce.deduction.categoty"
-msgstr ""
-
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: field:hr.payslip,other_pay:0
@@ -341,6 +256,12 @@ msgstr ""
 msgid "Amount"
 msgstr "金额"
 
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please check configuration of %s, payroll head is missing"
+msgstr ""
+
 #. module: hr_payroll
 #: selection:company.contribution,amount_type:0
 msgid "Percentage"
@@ -520,40 +441,6 @@ msgstr "结束日期"
 msgid "Employee PaySlip"
 msgstr "员工工资单"
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error : %s ' % (e)))\n"
-"                amount = 0.0\n"
-"                if line.amount_type == 'per':\n"
-"                    amount = amt * line.amount\n"
-"                elif line.amount_type == 'func':\n"
-"                    amount = slip_line_pool.execute_function(cr, uid, "
-"line.id, amt, context)\n"
-"                elif line.amount_type == 'fix':\n"
-"                    amount = line.amount\n"
-"                \n"
-"                if line.type == 'allowance':\n"
-"                    allowance += amount\n"
-"                elif line.type == 'deduction':\n"
-"                    deduction += amount\n"
-"            \n"
-"            vals[employee.id] = {\n"
-"                'basic':basic, \n"
-"                'advantages_gross':allowance, \n"
-"                'gross':basic + allowance, \n"
-"                'advantages_net':deduction,\n"
-"                'net':basic + allowance - deduction\n"
-"            }\n"
-"        return vals\n"
-"    \n"
-"    _columns = {\n"
-"        'passport_id':fields.many2one('hr.passport', 'Passport', "
-"required=False, domain=\"[('employee_id','=',active_id), "
-"('address_id','=',address_home_id)]\", help=\"Employee Passport Information"
-msgstr ""
-
 #. module: hr_payroll
 #: field:hr.payslip,leaves:0
 msgid "Leave Deductions"
@@ -663,12 +550,6 @@ msgstr "核实表"
 msgid "No of Working days / week for an employee"
 msgstr ""
 
-#. module: hr_payroll
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以x_开头并且不能包含特殊字符"
-
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
@@ -747,14 +628,6 @@ msgstr ""
 msgid "Fixed Amount"
 msgstr "固定金额"
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error : %s ' % (e)))\n"
-"                elif line.amount_type in ('fix', 'func"
-msgstr ""
-
 #. module: hr_payroll
 #: field:company.contribution.line,to_val:0
 #: report:employees.salary:0
@@ -763,11 +636,6 @@ msgstr ""
 msgid "To"
 msgstr "到"
 
-#. module: hr_payroll
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效的视图结构xml文件!"
-
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
@@ -785,28 +653,6 @@ msgstr ""
 msgid "Pay Salary"
 msgstr "支付薪酬"
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Please define bank account for the %s employee' % (slip.employee_id.name)))\n"
-"                pline = {\n"
-"                    'advice_id':pid,\n"
-"                    'name':slip.employee_id.bank_account_id.acc_number,\n"
-"                    'employee_id':slip.employee_id.id,\n"
-"                    'amount':slip.other_pay + slip.net,\n"
-"                    'bysal':slip.net\n"
-"                }\n"
-"                id = advice_line_pool.create(cr, uid, pline, "
-"context=context)\n"
-"\n"
-"        self.write(cr, uid, ids, {'state':'confirm'}, context=context)\n"
-"        return True\n"
-"\n"
-"    def process_sheet(self, cr, uid, ids, context=None):\n"
-"        slip_pool = self.pool.get('hr.payslip"
-msgstr ""
-
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,name:0
 msgid "Bank Account A/C"
@@ -983,11 +829,6 @@ msgstr ""
 msgid "Earnings"
 msgstr "收入"
 
-#. module: hr_payroll
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
@@ -1234,28 +1075,6 @@ msgstr ""
 msgid "Label"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error : %s ' % (e)))\n"
-"\n"
-"                if not calculate:\n"
-"                    continue\n"
-"\n"
-"                percent = 0.0\n"
-"                value = 0.0\n"
-"                base = False\n"
-"                company_contrib = 0.0\n"
-"                base = line.category_id.base\n"
-"\n"
-"                try:\n"
-"                    #Please have a look at the configuration guide.\n"
-"                    amt = eval(base, obj)\n"
-"                except Exception, e:\n"
-"                    raise osv.except_osv(_('Variable Error !"
-msgstr ""
-
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
 #: view:hr.payslip:0
@@ -1551,10 +1370,9 @@ msgid "Net Sal."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "年薪"
+#: sql_constraint:hr.passport:0
+msgid "The Passport No must be unique !"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
@@ -1686,6 +1504,12 @@ msgstr ""
 msgid "Payroll Configurtion"
 msgstr "工资单设置"
 
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
 #. module: hr_payroll
 #: field:hr.passport,date_issue:0
 msgid "Passport Issue Date"
@@ -1739,6 +1563,12 @@ msgstr "员工工资单"
 msgid "Letter Content"
 msgstr "信的内容"
 
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Year Salary"
+msgstr "年薪"
+
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Allowance / Deduction"
@@ -1774,6 +1604,9 @@ msgstr ""
 #~ msgid "Axis Bank"
 #~ msgstr "Axis银行"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "在动作定义中使用了无效的模快名。"
+
 #~ msgid "Employee No"
 #~ msgstr "员工编号"
 
@@ -1889,6 +1722,9 @@ msgstr ""
 #~ msgid "Please defined the Partner in Home Address !!"
 #~ msgstr "请定义业务伙伴主页地址!"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效的视图结构xml文件!"
+
 #~ msgid "Account Lines"
 #~ msgstr "明细"
 
@@ -1913,6 +1749,10 @@ msgstr ""
 #~ msgid "Passport and Visa"
 #~ msgstr "护照和visa"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名必须以x_开头并且不能包含特殊字符"
+
 #~ msgid "Employee Contract"
 #~ msgstr "员工合约"
 
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 3489c8a6473..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-09 08:41+0000\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-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
@@ -185,7 +185,7 @@ msgstr ""
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
-"Erro ! Não pode seleccionar um departamento cujo empregado é o gestor."
+"Erro! Não pode seleccionar um departamento cujo gestor é o empregado."
 
 #. module: hr_payroll_account
 #: help:hr.payroll.register,period_id:0
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/es.po b/addons/hr_recruitment/i18n/es.po
new file mode 100644
index 00000000000..b29b868e070
--- /dev/null
+++ b/addons/hr_recruitment/i18n/es.po
@@ -0,0 +1,921 @@
+# 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:43+0000\n"
+"PO-Revision-Date: 2010-12-14 22:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_recruitment
+#: help:hr.applicant,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the case "
+"without removing it."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: field:hr.recruitment.stage,requirements:0
+msgid "Requirements"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,nbr:0
+msgid "# of Cases"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Group By..."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,department_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,department_id:0
+#: field:hr.recruitment.stage,department_id:0
+msgid "Department"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_action:0
+msgid "Next Action Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,company_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.partner.create,close:0
+msgid "Close job request"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,note:0
+msgid "Goals"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,partner_address_id:0
+msgid "Partner Contact Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: view:hr.recruitment.partner.create:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
+msgid "Create Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contract Data"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Add Internal Note"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next Actions"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job2
+msgid "Junior Developer"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,job_id:0
+#: field:hr.recruitment.report,job_id:0
+msgid "Applied Job"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
+msgid "Graduate"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
+msgid "Initial Jobs Demand"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_address_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,reference:0
+msgid "Reference"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:board.board:0
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_applicants_status
+msgid "Applicants Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "My Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,title_action:0
+msgid "Next Action"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment
+msgid "Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop:0
+msgid "Salary Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Avg Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.recruitment.report,available:0
+msgid "Availability"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Previous"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:0
+#: view:hr.applicant:0
+#, python-format
+msgid "Phone Call"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Convert To Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_report
+msgid "Recruitments Statistics"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_job
+msgid "Job Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#, python-format
+msgid "A partner is already defined on this job request."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "New"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,availability:0
+msgid "Availability (Days)"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Available"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,create_date:0
+#: view:hr.recruitment.report:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,deadline:0
+msgid "Planned Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,priority:0
+#: field:hr.recruitment.report,priority:0
+msgid "Appreciation"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,stage_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,stage_id:0
+#: view:hr.recruitment.stage:0
+msgid "Stage"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job3
+msgid "Second Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_exp:0
+msgid "Salary Expected"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_expected:0
+#: view:hr.recruitment.report:0
+msgid "Expected Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Subject"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
+#: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
+msgid "Applicants"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History Information"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Dates"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
+msgid " > Bac +5"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_applicant
+msgid "Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,sequence:0
+msgid "Gives the sequence order when displaying a list of stages."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contact"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Qualification"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
+msgid "Stage of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage
+msgid "Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "In progress"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Jobs - Recruitment Form"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,probability:0
+msgid "Probability"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.module.module,shortdesc:hr_recruitment.module_meta_information
+msgid "HR - Recruitement"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job Info"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_proposed:0
+#: view:hr.recruitment.report:0
+msgid "Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job1
+msgid "Salesman"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_name:0
+msgid "Applicant's Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Very Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "# Cases"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Group By ..."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reset to New"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_expected:0
+msgid "Salary Expected by Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_closed:0
+#: field:hr.recruitment.report,date_closed:0
+msgid "Closed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+msgid "Stage Definition"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Answer"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_proposed:0
+msgid "Salary Proposed by the Organisation"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Meeting"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,type_id:0
+#: view:hr.recruitment.degree:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,type_id:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action
+msgid "Degree"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Global CC"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_stage_act
+msgid "Applicant Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job7
+msgid "Refused by Company"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Excellent"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,response:0
+msgid "Response"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
+msgid "Licenced"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop_avg:0
+msgid "Avg Salary Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_phonecall
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_job2phonecall
+msgid "Schedule Phone Call"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Not Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date:0
+#: field:hr.recruitment.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+msgid "Phone Call Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Are you sure you want to create a partner based on this job request ?"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Attachments"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
+msgid "Contract Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: view:hr.recruitment.partner.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_categ_action
+msgid "Applicant Categories"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#, python-format
+msgid "A partner is already existing with the same name."
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.degree,sequence:0
+msgid "Gives the sequence order when displaying a list of degrees."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,user_id:0
+#: view:hr.recruitment.report:0
+msgid "Responsible"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_report_all
+msgid "Recruitment Analysis"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Current"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Details"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Cases By Stage and Estimates"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reply"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,description:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job5
+msgid "Contract Signed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: selection:hr.recruitment.report,state:0
+msgid "Refused"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:0
+#, python-format
+msgid "Applicant '%s' is being hired."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Hired"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job6
+msgid "Refused by Employee"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "On Average"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Emails"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,name:0
+#: field:hr.recruitment.degree,name:0
+#: field:hr.recruitment.stage,name:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_partner_create
+msgid "Create Partner from job application"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:crm.case.section,name:hr_recruitment.section_hr_department
+msgid "HR Department"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.degree,sequence:0
+#: field:hr.recruitment.stage,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:0
+#, python-format
+msgid "The job request '%s' has been set 'in progress'."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.report,delay_close:0
+#: help:hr.recruitment.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,survey:0
+#: field:hr.job,survey_id:0
+msgid "Survey"
+msgstr ""
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
new file mode 100644
index 00000000000..87d40da7cd4
--- /dev/null
+++ b/addons/hr_recruitment/i18n/sv.po
@@ -0,0 +1,921 @@
+# Swedish 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:43+0000\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-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_recruitment
+#: help:hr.applicant,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the case "
+"without removing it."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: field:hr.recruitment.stage,requirements:0
+msgid "Requirements"
+msgstr "Krav"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,nbr:0
+msgid "# of Cases"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Group By..."
+msgstr "Gruppera på..."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,department_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,department_id:0
+#: field:hr.recruitment.stage,department_id:0
+msgid "Department"
+msgstr "Avdelning"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_action:0
+msgid "Next Action Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Jobs"
+msgstr "Jobb"
+
+#. module: hr_recruitment
+#: field:hr.applicant,company_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,company_id:0
+msgid "Company"
+msgstr "Företag"
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.partner.create,close:0
+msgid "Close job request"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,note:0
+msgid "Goals"
+msgstr "Mål"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,partner_address_id:0
+msgid "Partner Contact Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: view:hr.recruitment.partner.create:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
+msgid "Create Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contract Data"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Add Internal Note"
+msgstr "Lägg till intern notering"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_mobile:0
+msgid "Mobile"
+msgstr "Mobil"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Notes"
+msgstr "Anteckningar"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_ids:0
+msgid "Messages"
+msgstr "Meddelanden"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next Actions"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job2
+msgid "Junior Developer"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,job_id:0
+#: field:hr.recruitment.report,job_id:0
+msgid "Applied Job"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
+msgid "Graduate"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
+msgid "Initial Jobs Demand"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_address_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,reference:0
+msgid "Reference"
+msgstr "Referens"
+
+#. module: hr_recruitment
+#: view:board.board:0
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_applicants_status
+msgid "Applicants Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "My Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,title_action:0
+msgid "Next Action"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment
+msgid "Recruitment"
+msgstr "Rekrytering"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop:0
+msgid "Salary Proposed"
+msgstr "Föreslagen lön"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Avg Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.recruitment.report,available:0
+msgid "Availability"
+msgstr "Tillgänglighet"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Previous"
+msgstr "Föregående"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:0
+#: view:hr.applicant:0
+#, python-format
+msgid "Phone Call"
+msgstr "Telefonsamtal"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Convert To Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_report
+msgid "Recruitments Statistics"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next"
+msgstr "Nästa"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_job
+msgid "Job Description"
+msgstr "Arbetsbeskrivning"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#, python-format
+msgid "A partner is already defined on this job request."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "New"
+msgstr "Ny"
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_from:0
+msgid "Email"
+msgstr "Epost"
+
+#. module: hr_recruitment
+#: field:hr.applicant,availability:0
+msgid "Availability (Days)"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Available"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Good"
+msgstr "Bra"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#, python-format
+msgid "Error !"
+msgstr "Fel !"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,create_date:0
+#: view:hr.recruitment.report:0
+msgid "Creation Date"
+msgstr "Skapad datum"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,deadline:0
+msgid "Planned Date"
+msgstr "Planerat datum"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,priority:0
+#: field:hr.recruitment.report,priority:0
+msgid "Appreciation"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job"
+msgstr "Jobb"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,stage_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,stage_id:0
+#: view:hr.recruitment.stage:0
+msgid "Stage"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job3
+msgid "Second Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_exp:0
+msgid "Salary Expected"
+msgstr "Förväntad lön"
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_expected:0
+#: view:hr.recruitment.report:0
+msgid "Expected Salary"
+msgstr "Förväntad lön"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Subject"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
+#: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
+msgid "Applicants"
+msgstr "Sökande"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History Information"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Dates"
+msgstr "Datum"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
+msgid " > Bac +5"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_applicant
+msgid "Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,sequence:0
+msgid "Gives the sequence order when displaying a list of stages."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contact"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Qualification"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
+msgid "Stage of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage
+msgid "Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "In progress"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Jobs - Recruitment Form"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,probability:0
+msgid "Probability"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.module.module,shortdesc:hr_recruitment.module_meta_information
+msgid "HR - Recruitement"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job Info"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_proposed:0
+#: view:hr.recruitment.report:0
+msgid "Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job1
+msgid "Salesman"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_name:0
+msgid "Applicant's Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Very Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "# Cases"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Group By ..."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reset to New"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_expected:0
+msgid "Salary Expected by Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_closed:0
+#: field:hr.recruitment.report,date_closed:0
+msgid "Closed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+msgid "Stage Definition"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Answer"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_proposed:0
+msgid "Salary Proposed by the Organisation"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Meeting"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,type_id:0
+#: view:hr.recruitment.degree:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,type_id:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action
+msgid "Degree"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Global CC"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_stage_act
+msgid "Applicant Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job7
+msgid "Refused by Company"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Excellent"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,response:0
+msgid "Response"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
+msgid "Licenced"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop_avg:0
+msgid "Avg Salary Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_phonecall
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_job2phonecall
+msgid "Schedule Phone Call"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Not Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date:0
+#: field:hr.recruitment.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+msgid "Phone Call Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Are you sure you want to create a partner based on this job request ?"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Attachments"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
+msgid "Contract Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: view:hr.recruitment.partner.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_categ_action
+msgid "Applicant Categories"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#, python-format
+msgid "A partner is already existing with the same name."
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.degree,sequence:0
+msgid "Gives the sequence order when displaying a list of degrees."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,user_id:0
+#: view:hr.recruitment.report:0
+msgid "Responsible"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_report_all
+msgid "Recruitment Analysis"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Current"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Details"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Cases By Stage and Estimates"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reply"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,description:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job5
+msgid "Contract Signed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: selection:hr.recruitment.report,state:0
+msgid "Refused"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:0
+#, python-format
+msgid "Applicant '%s' is being hired."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Hired"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job6
+msgid "Refused by Employee"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "On Average"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Emails"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,name:0
+#: field:hr.recruitment.degree,name:0
+#: field:hr.recruitment.stage,name:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_partner_create
+msgid "Create Partner from job application"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:crm.case.section,name:hr_recruitment.section_hr_department
+msgid "HR Department"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.degree,sequence:0
+#: field:hr.recruitment.stage,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:0
+#, python-format
+msgid "The job request '%s' has been set 'in progress'."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.report,delay_close:0
+#: help:hr.recruitment.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,survey:0
+#: field:hr.job,survey_id:0
+msgid "Survey"
+msgstr ""
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 447b04ecf68..6c7c5618311 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/ar.po b/addons/hr_timesheet_sheet/i18n/ar.po
index 153951ab0dc..3754d4064e9 100644
--- a/addons/hr_timesheet_sheet/i18n/ar.po
+++ b/addons/hr_timesheet_sheet/i18n/ar.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr ""
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -37,26 +34,40 @@ msgid "Sheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -65,15 +76,35 @@ msgid "Today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr ""
 
@@ -83,19 +114,14 @@ msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -104,7 +130,11 @@ msgid "Validate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr ""
 
@@ -113,6 +143,17 @@ msgstr ""
 msgid "Present"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -120,54 +161,57 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
@@ -176,30 +220,46 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr ""
 
@@ -215,28 +275,43 @@ msgid "Timesheet lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -250,8 +325,19 @@ msgid "Timesheet Lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -260,8 +346,20 @@ msgid "No employee defined"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -270,13 +368,16 @@ msgid "Configuration"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -285,9 +386,20 @@ msgid "Daily View"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -296,9 +408,14 @@ msgid "Sign In"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -307,72 +424,122 @@ msgid "Go to:"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: selection:hr_timesheet_sheet.sheet,state:0
-msgid "Draft"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
+msgid "In Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -381,13 +548,24 @@ msgid "Current Status"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -396,29 +574,79 @@ msgid "Timesheet by Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -427,24 +655,46 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -453,30 +703,58 @@ msgid "Timesheet by Accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -487,13 +765,26 @@ msgid "Attendances"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,name:0
-msgid "Description"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -501,11 +792,28 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -513,29 +821,36 @@ msgstr ""
 msgid "Difference"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -544,13 +859,13 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -559,39 +874,61 @@ msgid "Analytic accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
diff --git a/addons/hr_timesheet_sheet/i18n/bg.po b/addons/hr_timesheet_sheet/i18n/bg.po
index 114a5682223..f3aa172e24a 100644
--- a/addons/hr_timesheet_sheet/i18n/bg.po
+++ b/addons/hr_timesheet_sheet/i18n/bg.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 11:52+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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr ""
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -37,26 +34,40 @@ msgid "Sheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -65,15 +76,35 @@ msgid "Today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr ""
 
@@ -83,19 +114,14 @@ msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -104,7 +130,11 @@ msgid "Validate"
 msgstr "Проверка"
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr ""
 
@@ -113,6 +143,17 @@ msgstr ""
 msgid "Present"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -120,54 +161,57 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
@@ -176,30 +220,46 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr ""
 
@@ -215,28 +275,43 @@ msgid "Timesheet lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -250,8 +325,19 @@ msgid "Timesheet Lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -260,8 +346,20 @@ msgid "No employee defined"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -270,14 +368,17 @@ msgid "Configuration"
 msgstr "Настройка"
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -285,9 +386,20 @@ msgid "Daily View"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -296,9 +408,14 @@ msgid "Sign In"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -307,72 +424,122 @@ msgid "Go to:"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: selection:hr_timesheet_sheet.sheet,state:0
-msgid "Draft"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
+msgid "In Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -381,13 +548,24 @@ msgid "Current Status"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -396,29 +574,79 @@ msgid "Timesheet by Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -427,24 +655,46 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -453,32 +703,58 @@ msgid "Timesheet by Accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-"символи!"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -489,13 +765,26 @@ msgid "Attendances"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,name:0
-msgid "Description"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -503,11 +792,28 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -515,29 +821,36 @@ msgstr ""
 msgid "Difference"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -546,13 +859,13 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -561,39 +874,70 @@ msgid "Analytic accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Невалиден XML за преглед на архитектурата"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
+#~ "символи!"
diff --git a/addons/hr_timesheet_sheet/i18n/bs.po b/addons/hr_timesheet_sheet/i18n/bs.po
index b103807fdc9..50b1e6e0f69 100644
--- a/addons/hr_timesheet_sheet/i18n/bs.po
+++ b/addons/hr_timesheet_sheet/i18n/bs.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 11:52+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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr ""
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -37,26 +34,40 @@ msgid "Sheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -65,15 +76,35 @@ msgid "Today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr ""
 
@@ -83,19 +114,14 @@ msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -104,7 +130,11 @@ msgid "Validate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr ""
 
@@ -113,6 +143,17 @@ msgstr ""
 msgid "Present"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -120,54 +161,57 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
@@ -176,30 +220,46 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr ""
 
@@ -215,28 +275,43 @@ msgid "Timesheet lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -250,8 +325,19 @@ msgid "Timesheet Lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -260,8 +346,20 @@ msgid "No employee defined"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -270,14 +368,17 @@ msgid "Configuration"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -285,9 +386,20 @@ msgid "Daily View"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -296,9 +408,14 @@ msgid "Sign In"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -307,72 +424,122 @@ msgid "Go to:"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: selection:hr_timesheet_sheet.sheet,state:0
-msgid "Draft"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
+msgid "In Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -381,13 +548,24 @@ msgid "Current Status"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -396,29 +574,79 @@ msgid "Timesheet by Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -427,24 +655,46 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -453,30 +703,58 @@ msgid "Timesheet by Accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -487,13 +765,26 @@ msgid "Attendances"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,name:0
-msgid "Description"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -501,11 +792,28 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -513,29 +821,36 @@ msgstr ""
 msgid "Difference"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -544,13 +859,13 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -559,39 +874,64 @@ msgid "Analytic accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
diff --git a/addons/hr_timesheet_sheet/i18n/ca.po b/addons/hr_timesheet_sheet/i18n/ca.po
index deb8542579d..68a96481dca 100644
--- a/addons/hr_timesheet_sheet/i18n/ca.po
+++ b/addons/hr_timesheet_sheet/i18n/ca.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-13 11:17+0000\n"
 "Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr "Revisa final del dia comprovació dia està completa"
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -40,27 +37,41 @@ msgid "Sheet"
 msgstr "Full"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de model no vàlid en la definició de l'acció."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr "No s'ha definit un empleat pel vostre usuari!"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr "Total servei"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
-msgstr "Els meus fulls de serveis a confirmar"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
-msgstr "Rang full de serveis"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -68,15 +79,36 @@ msgid "Today"
 msgstr "Avui"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
-msgstr "Confirma full de serveis"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
+msgstr ""
+"Verifiqueu que la diferència total del full de serveis és menor que %.2f!"
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr "Full de serveis"
 
@@ -86,20 +118,15 @@ msgid "Set to Draft"
 msgstr "Canvia a esborrany"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
-msgstr "Definiu entrada full de serveis de l'empleat"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "Data fins"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr "Full de serveis esborrany"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
-msgstr "El meu full de serveis actual"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -107,7 +134,11 @@ msgid "Validate"
 msgstr "Valida"
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr "Dia"
 
@@ -116,6 +147,17 @@ msgstr "Dia"
 msgid "Present"
 msgstr "Present"
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr "Error d'usuari"
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -123,59 +165,57 @@ msgid "Refuse"
 msgstr "Refusar"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr "Full de serveis validat"
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-"Heu de seleccionar una data actual que estigui en les dates del full de "
-"serveis!"
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr "Diferència total"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr "Codificació trucada telefònica"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr "Full de serveis per dia"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr "Definiu la tasca de treball en línia full de serveis"
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
-"Diferència permesa entre el registre d'entrada/sortida i el càlcul del "
-"temps per un full de servei. Estableix el seu valor a 0 si no vol cap "
-"control."
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
-msgstr "Full de serveis per dies"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
-msgstr "Full de serveis serà confirmada al final de la setmana / mes"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
+msgstr "No podeu registrar una entrada en una altre data que no sigui avui"
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Atenció!"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr "Compte analític"
 
@@ -184,30 +224,46 @@ msgstr "Compte analític"
 msgid "Project Timesheet"
 msgstr "Full de serveis del projecte"
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr "Data des de"
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
-msgstr "Procés full d'assistència RH"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
-msgstr "Cost analític"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "Fulls de treball"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr "Confirmada"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr "Assistència"
 
@@ -223,29 +279,44 @@ msgid "Timesheet lines"
 msgstr "Línies full de serveis"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
-msgstr "Codifiqueu la vostra línia de full de serveis"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
-msgstr "Confirma full de serveis"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
-msgstr "Control pel responsable del projecte"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr "Nou"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
-msgstr "Full de serveis confirmat al final del període"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
+msgstr "Error!"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
@@ -258,9 +329,20 @@ msgid "Timesheet Lines"
 msgstr "Línies de la full d'assistència"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
-msgstr "Confirma full de serveis al final del període"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -268,9 +350,21 @@ msgid "No employee defined"
 msgstr "No hi ha empleat definit"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
-msgstr "Full de serveis confirmat"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Acció no vàlida!"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
@@ -278,14 +372,17 @@ msgid "Configuration"
 msgstr "Configuració"
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
-msgstr "Setmana"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -293,10 +390,21 @@ msgid "Daily View"
 msgstr "Vista diària"
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
-msgstr "Fulls de serveis per període"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr "Total full de serveis"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -304,10 +412,15 @@ msgid "Sign In"
 msgstr "Registra entrada"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
-msgstr "Full de serveis del meu departament"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -315,73 +428,123 @@ msgid "Go to:"
 msgstr "Anar a:"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
-msgstr "Trucada telefònica"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
-msgstr "Total full de serveis"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr "Revisió de treball"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
-msgstr "Factura sobre treball"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr "Mes"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr "Codifica vostres hores i registra entrada/sortida"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr "Revisió"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Draft"
 msgstr "Esborrany"
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
-msgstr "Fulls de treball"
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
-msgstr "Fulles de serveis a confirmar"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr "No podeu registrar sortida en altre data que no sigui avui"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
-msgstr "Posició"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
-msgstr "Data fins"
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr "Setmana"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -389,14 +552,25 @@ msgid "Current Status"
 msgstr "Estat actual"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
-msgstr "Factura sobre full de serveis"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
+msgstr "No podeu modificar una entrada en un full de serveis confirmat!"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
-msgstr "Factura basada en full de serveis"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr "Usuari"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
@@ -404,30 +578,80 @@ msgid "Timesheet by Account"
 msgstr "Full de serveis per compte"
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr "Data"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
-msgstr "Usuari"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
-msgstr "Crea factura basada en full de serveis"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
-msgstr "Fulles de serveis a validar"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
-msgstr "Diferència permesa full de serveis"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr "No podeu modificar una entrada en un full de serveis confirmat!"
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -435,25 +659,47 @@ msgstr "Diferència permesa full de serveis"
 msgid "Period"
 msgstr "Període"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr "Realitzat"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
-msgstr "Converteixi entrada d'assistència/servei en full de serveis"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
-msgstr "Crea el vostre cost analític d'acord amb quantitat"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
-msgstr "Línia del full de assistència"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -461,33 +707,59 @@ msgid "Timesheet by Accounts"
 msgstr "Full de serveis per comptes"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr "No es poden eliminar full(s) que ja estan confirmats!"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
 msgstr ""
-"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-"especial!"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
-msgstr "Full de serveis és validat pel responsable del projecte"
+#: help:hr_timesheet_sheet.sheet,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
-msgstr "Qualsevol temps que dediqueu a la trucada telefònica"
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
-msgstr "Valida full de serveis"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
-msgstr "Full de serveis del meu departament a confirmar"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línia del full de assistència"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -497,25 +769,55 @@ msgid "Attendances"
 msgstr "Serveis"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
-msgstr "Crea cost analític"
-
-#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,name:0
 #: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
 msgid "Description"
 msgstr "Descripció"
 
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign Out"
 msgstr "Registra sortida"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr "Per dia"
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -523,30 +825,37 @@ msgstr "Per dia"
 msgid "Difference"
 msgstr "Diferència"
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr "Full de serveis"
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr "Absent"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
-msgstr "Al final del període (setmana/mes)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
-msgstr "entrada full de serveis està en estat esborrany."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
-msgstr "Cost analític és creat"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -554,14 +863,14 @@ msgid "Invoice rate"
 msgstr "Taxa factura"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
-msgstr "Codifica quant temps dedica en trucades telefòniques"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
+msgstr "Factura sobre treball"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
-msgstr "Reviseu el vostre treball al final del dia"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -569,39 +878,242 @@ msgid "Analytic accounts"
 msgstr "Comptes analítics"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
-msgstr "Els meus fulls de serveis"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
-msgstr "Accepta"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr "Data actual"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
-msgstr "Fulls de serveis no validats"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr "Any"
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr "Total"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
-msgstr "Full de serveis del meu departament a validar"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#~ msgid "Review end of day check day is complete"
+#~ msgstr "Revisa final del dia comprovació dia està completa"
+
+#~ msgid "My timesheets to confirm"
+#~ msgstr "Els meus fulls de serveis a confirmar"
+
+#~ msgid "Timeshet range"
+#~ msgstr "Rang full de serveis"
+
+#~ msgid "Confirm timesheet sheet"
+#~ msgstr "Confirma full de serveis"
+
+#~ msgid "Defines employee's timesheet entry"
+#~ msgstr "Definiu entrada full de serveis de l'empleat"
+
+#~ msgid "Draft Timesheet sheet"
+#~ msgstr "Full de serveis esborrany"
+
+#~ msgid "My Current Timesheet"
+#~ msgstr "El meu full de serveis actual"
+
+#~ msgid "Validated Timesheet"
+#~ msgstr "Full de serveis validat"
+
+#~ msgid "You must select a Current date wich is in the timesheet dates !"
+#~ msgstr ""
+#~ "Heu de seleccionar una data actual que estigui en les dates del full de "
+#~ "serveis!"
+
+#~ msgid "Total Difference"
+#~ msgstr "Diferència total"
+
+#~ msgid "Phone call encoding"
+#~ msgstr "Codificació trucada telefònica"
+
+#~ msgid "Timesheet by Day"
+#~ msgstr "Full de serveis per dia"
+
+#~ msgid "Defines the task work entry into timesheet line"
+#~ msgstr "Definiu la tasca de treball en línia full de serveis"
+
+#~ msgid ""
+#~ "Allowed difference between the sign in/out and the timesheet computation for "
+#~ "one sheet. Set this to 0 if you do not want any control."
+#~ msgstr ""
+#~ "Diferència permesa entre el registre d'entrada/sortida i el càlcul del "
+#~ "temps per un full de servei. Estableix el seu valor a 0 si no vol cap "
+#~ "control."
+
+#~ msgid "Timesheet by Days"
+#~ msgstr "Full de serveis per dies"
+
+#~ msgid "timesheet is confirmed at the end of the week / month"
+#~ msgstr "Full de serveis serà confirmada al final de la setmana / mes"
+
+#~ msgid "Hr Timesheet Process"
+#~ msgstr "Procés full d'assistència RH"
+
+#~ msgid "Analytic cost"
+#~ msgstr "Cost analític"
+
+#~ msgid "Encode your timesheet line"
+#~ msgstr "Codifiqueu la vostra línia de full de serveis"
+
+#~ msgid "Confirm Timesheet"
+#~ msgstr "Confirma full de serveis"
+
+#~ msgid "Control by the project manager"
+#~ msgstr "Control pel responsable del projecte"
+
+#~ msgid "Timesheet sheet confirm at the end of the period"
+#~ msgstr "Full de serveis confirmat al final del període"
+
+#~ msgid "Confirm timesheet at the end of the period"
+#~ msgstr "Confirma full de serveis al final del període"
+
+#~ msgid "Confirmed Timesheet"
+#~ msgstr "Full de serveis confirmat"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invàlid per a la definició de la vista!"
+
+#~ msgid "Timesheets by period"
+#~ msgstr "Fulls de serveis per període"
+
+#~ msgid "My Department's Timesheet"
+#~ msgstr "Full de serveis del meu departament"
+
+#~ msgid "Phone call"
+#~ msgstr "Trucada telefònica"
+
+#~ msgid "Review of work"
+#~ msgstr "Revisió de treball"
+
+#~ msgid "Encode Your hours and Sign in / out"
+#~ msgstr "Codifica vostres hores i registra entrada/sortida"
+
+#~ msgid "Review"
+#~ msgstr "Revisió"
+
+#~ msgid "Timesheets To Confirm"
+#~ msgstr "Fulles de serveis a confirmar"
+
+#~ msgid "Status"
+#~ msgstr "Posició"
+
+#~ msgid "Invoice on timesheet"
+#~ msgstr "Factura sobre full de serveis"
+
+#~ msgid "Invoice based on timesheet"
+#~ msgstr "Factura basada en full de serveis"
+
+#~ msgid "Creates invoice based on timesheet"
+#~ msgstr "Crea factura basada en full de serveis"
+
+#~ msgid "Timesheets To Validate"
+#~ msgstr "Fulles de serveis a validar"
+
+#~ msgid "Timesheet allowed difference"
+#~ msgstr "Diferència permesa full de serveis"
+
+#~ msgid "Attendance entry moves into the timesheet"
+#~ msgstr "Converteixi entrada d'assistència/servei en full de serveis"
+
+#~ msgid "Creates your analytic cost accoording to quantity"
+#~ msgstr "Crea el vostre cost analític d'acord amb quantitat"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+#~ "especial!"
+
+#~ msgid "Timesheet is validate by project manager."
+#~ msgstr "Full de serveis és validat pel responsable del projecte"
+
+#~ msgid "Whatever time u spent for phone call"
+#~ msgstr "Qualsevol temps que dediqueu a la trucada telefònica"
+
+#~ msgid "Validate Timesheet"
+#~ msgstr "Valida full de serveis"
+
+#~ msgid "My Department's Timesheet to Confirm"
+#~ msgstr "Full de serveis del meu departament a confirmar"
+
+#~ msgid "Create Analytic cost"
+#~ msgstr "Crea cost analític"
+
+#~ msgid "hr_timesheet_sheet.sheet"
+#~ msgstr "Full de serveis"
+
+#~ msgid "At the end of the period (week/month)"
+#~ msgstr "Al final del període (setmana/mes)"
+
+#~ msgid "timesheet entry is into draft state."
+#~ msgstr "entrada full de serveis està en estat esborrany."
+
+#~ msgid "Analytic cost is created"
+#~ msgstr "Cost analític és creat"
+
+#~ msgid "Encode how much time u spent on phone call"
+#~ msgstr "Codifica quant temps dedica en trucades telefòniques"
+
+#~ msgid "Review of your work at the end of the day"
+#~ msgstr "Reviseu el vostre treball al final del dia"
+
+#~ msgid "My timesheets"
+#~ msgstr "Els meus fulls de serveis"
+
+#~ msgid "Accept"
+#~ msgstr "Accepta"
+
+#~ msgid "Unvalidated Timesheets"
+#~ msgstr "Fulls de serveis no validats"
+
+#~ msgid "My Department's Timesheet to Validate"
+#~ msgstr "Full de serveis del meu departament a validar"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom de model no vàlid en la definició de l'acció."
diff --git a/addons/hr_timesheet_sheet/i18n/cs.po b/addons/hr_timesheet_sheet/i18n/cs.po
index 40cdc435468..e075e7119a1 100644
--- a/addons/hr_timesheet_sheet/i18n/cs.po
+++ b/addons/hr_timesheet_sheet/i18n/cs.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 06:27+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr ""
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -37,26 +34,40 @@ msgid "Sheet"
 msgstr "List"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Špatný název modelu v definici akce"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr "Pro vašeho uživatele není nastaven žádný zaměstnanec !"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr "Celková návštěvnost"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -65,15 +76,35 @@ msgid "Today"
 msgstr "Dnes"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr ""
 
@@ -83,19 +114,14 @@ msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
-msgstr ""
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "Datum do"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -104,7 +130,11 @@ msgid "Validate"
 msgstr "Ověřit"
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr "Den"
 
@@ -113,6 +143,17 @@ msgstr "Den"
 msgid "Present"
 msgstr "Současný"
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -120,54 +161,57 @@ msgid "Refuse"
 msgstr "Odmítnout"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr "Ověřený časový rozvrh"
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr "Časový rozvrh dne"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
-msgstr "Časový rozvrh dnů"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Varování !"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr "Analytický účet"
 
@@ -176,30 +220,46 @@ msgstr "Analytický účet"
 msgid "Project Timesheet"
 msgstr "Projekt časový rozvrh"
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr "Potvrzeno"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr "Docházka"
 
@@ -215,30 +275,45 @@ msgid "Timesheet lines"
 msgstr "Linky časového rozvrhu"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr "Nový"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
+msgstr "Chyba !"
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
 msgid "Total Time"
@@ -250,8 +325,19 @@ msgid "Timesheet Lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -260,8 +346,20 @@ msgid "No employee defined"
 msgstr "Nebyl definová zaměstnanec"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Neplatná akce !"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -270,14 +368,17 @@ msgid "Configuration"
 msgstr "Konfigurace"
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
-msgstr "Týden"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neplatný XML pro View Architecture!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -285,9 +386,20 @@ msgid "Daily View"
 msgstr "Denní přehled"
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -296,9 +408,14 @@ msgid "Sign In"
 msgstr "Přihlásit"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -307,73 +424,123 @@ msgid "Go to:"
 msgstr "Jít na:"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
-msgstr "Telefonní volání"
-
-#. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr "Kontrola práce"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr "Měsíc"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr "Kontrola"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Draft"
 msgstr "Koncept"
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
-msgstr "Stav"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
-msgstr "Datum do"
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr "Týden"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -381,44 +548,105 @@ msgid "Current Status"
 msgstr "Současný stav"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr "Uživatel"
+
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
 msgid "Timesheet by Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr "Datum"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
-msgstr "Uživatel"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -427,24 +655,46 @@ msgstr ""
 msgid "Period"
 msgstr "Období"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr "Hotovo"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -453,30 +703,58 @@ msgid "Timesheet by Accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -487,13 +765,26 @@ msgid "Attendances"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,name:0
-msgid "Description"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -501,11 +792,28 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -513,29 +821,36 @@ msgstr ""
 msgid "Difference"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -544,13 +859,13 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -559,39 +874,88 @@ msgid "Analytic accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Špatný název modelu v definici akce"
+
+#~ msgid "Timesheet by Day"
+#~ msgstr "Časový rozvrh dne"
+
+#~ msgid "Validated Timesheet"
+#~ msgstr "Ověřený časový rozvrh"
+
+#~ msgid "Timesheet by Days"
+#~ msgstr "Časový rozvrh dnů"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neplatný XML pro View Architecture!"
+
+#~ msgid "Review"
+#~ msgstr "Kontrola"
+
+#~ msgid "Phone call"
+#~ msgstr "Telefonní volání"
+
+#~ msgid "Review of work"
+#~ msgstr "Kontrola práce"
+
+#~ msgid "Status"
+#~ msgstr "Stav"
diff --git a/addons/hr_timesheet_sheet/i18n/de.po b/addons/hr_timesheet_sheet/i18n/de.po
index 86e54cf78e0..2c665c34042 100644
--- a/addons/hr_timesheet_sheet/i18n/de.po
+++ b/addons/hr_timesheet_sheet/i18n/de.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-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/el.po b/addons/hr_timesheet_sheet/i18n/el.po
index 74ec4a78be6..36a4d6f6eed 100644
--- a/addons/hr_timesheet_sheet/i18n/el.po
+++ b/addons/hr_timesheet_sheet/i18n/el.po
@@ -6,26 +6,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 06:27+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr "Επισκόπηση τέλους ημέρας, έλεγχος ολοκλήρωσης ημέρας"
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -43,27 +40,41 @@ msgid "Sheet"
 msgstr "Φύλλο"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr "Δεν έχει οριστεί υπάλληλος για το χρήστη σας!"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr "Σύνολο Παρουσιών"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
-msgstr "Φύλλα Xρόνου Eργασίας μου προς επιβεβαίωση"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
-msgstr "Διάστημα Φύλλου Xρόνου Eργασίας"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -71,15 +82,37 @@ msgid "Today"
 msgstr "Σήμερα"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
-msgstr "Επιβεβαίωση Φύλλου Xρόνου Eργασίας"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
+msgstr ""
+"Παρακαλώ επιβεβαιώστε ότι η συνολική διαφορά του φύλλου είναι μικρότερη από "
+"%.2f !"
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr "Φύλλο Xρόνου Eργασίας"
 
@@ -89,20 +122,15 @@ msgid "Set to Draft"
 msgstr "Ορισμός ως Πρόχειρο"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
-msgstr "Ορίζει τις εγγραφές Φύλλου Xρόνου Eργασίας"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "Έως ημερ/νία"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr "Πρόχειρο Φύλλο Xρόνου Eργασίας"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
-msgstr "Τρέχον Φύλλο Xρόνου Eργασίας"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -110,7 +138,11 @@ msgid "Validate"
 msgstr "Επικύρωση"
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr "Ημέρα"
 
@@ -119,6 +151,17 @@ msgstr "Ημέρα"
 msgid "Present"
 msgstr "Παρών/ούσα"
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr "UserError"
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -126,58 +169,58 @@ msgid "Refuse"
 msgstr "Απόρριψη"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr "Επικυρωμένο Φύλλο Xρόνου Eργασίας"
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-"Πρέπει να επιλέξετε τρέχουσα ημερ/νία που να περιέχεται στο Φύλλο Xρόνου "
-"Eργασίας!"
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr "Σύνολο Διαφοράς"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr "Κωδικοποίηση τηλεφωνημάτων"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr "Φύλλο Xρόνου Eργασίας ανά Ημέρα"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr "Ορίζει την εγγραφή εργασίας στη γραμμή Φύλλου Xρόνου Eργασίας"
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
-"Επιτρεπόμενη διαφορά μεταξύ Προσέλευσης και υπολογισμού Xρόνου Eργασίας για "
-"ένα φύλλο. Αν δεν επιθυμείτε τον έλεγχο αυτό, ορίστε τιμή 0."
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
-msgstr "Φύλλο Xρόνου Eργασίας ανά Ημέρες"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
-msgstr "το Φύλλο Xρόνου Eργασίας επιβεβαιώνεται στο τέλος εβδομάδας / μήνα"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
+msgstr ""
+"Δεν μπορέιτε να προσέλθετε για εργασία σε άλλη ημερ/νία από τη σημερινή"
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Προσοχή!"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr "Αναλυτικός Λογαριασμός"
 
@@ -186,30 +229,46 @@ msgstr "Αναλυτικός Λογαριασμός"
 msgid "Project Timesheet"
 msgstr "Φύλλο Xρόνου Eργασίας Έργου"
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr "Από ημ/νία"
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
-msgstr "Διαδικασία Χρόνου Εργασίας Ανθρώπινου Δυναμικού"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
-msgstr "Αναλυτικό Κόστος"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "Φύλλα Xρόνου Eργασίας"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr "Επιβεβαιωμένο"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr "Παρουσίες"
 
@@ -225,29 +284,44 @@ msgid "Timesheet lines"
 msgstr "Γραμμές Φύλλου Xρόνου Eργασίας"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
-msgstr "Κωδικοποίηση γραμμής Φύλλου Xρόνου Eργασίας"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
-msgstr "Επιβεβαίωση Φύλλου Xρόνου Eργασίας"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
-msgstr "Έλεγχος από τη Διεύθυνση Έργου"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr "Νέο"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
-msgstr "Επιβεβαίωση Φύλλου Xρόνου Eργασίας στο τέλος της περιόδου"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
+msgstr "Σφάλμα!"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
@@ -260,9 +334,20 @@ msgid "Timesheet Lines"
 msgstr "Γραμμές Φύλλου Xρόνου Eργασίας"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
-msgstr "Επιβεβαίωση Χρόνου Εργασίας στο τέλος περιόδου!"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -270,9 +355,21 @@ msgid "No employee defined"
 msgstr "Δεν ορίστηκε υπάλληλος!"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
-msgstr "Επιβεβαιωμένο Φύλλο Xρόνου Eργασίας"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Μη επιτρεπόμενη ενέργεια!"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
@@ -280,14 +377,17 @@ msgid "Configuration"
 msgstr "Ρυθμίσεις"
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
-msgstr "Εβδομάδα"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -295,10 +395,21 @@ msgid "Daily View"
 msgstr "Ημερήσια εμφάνιση"
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
-msgstr "Φύλλα Xρόνου Eργασίας ανά περίοδο"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr "Συνολικός Xρόνος Eργασίας"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -306,10 +417,15 @@ msgid "Sign In"
 msgstr "Προσέλευση"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
-msgstr "Φύλλο Xρόνου Eργασίας του τμήματός μου"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -317,73 +433,123 @@ msgid "Go to:"
 msgstr "Πήγαινε:"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
-msgstr "Τηλεφώνημα"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
-msgstr "Συνολικός Xρόνος Eργασίας"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr "Επισκόπηση εργασίας"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
-msgstr "Τιμολόγηση με βάση την εργασία"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr "Μήνας"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr "Κωδικοποίηση ωρών και Προσελεύσεων / Αποχωρήσεων"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr "Επισκόπηση"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Draft"
 msgstr "Πρόχειρο"
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
-msgstr "Φύλλα Xρόνου Eργασίας"
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
-msgstr "Φύλλα Xρόνου Eργασίας προς Επιβεβαίωση"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr "Δεν μπορείτε να αποχωρήσετε άλλη ημέρα παρά μόνο σήμερα!"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
-msgstr "Κατάσταση"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
-msgstr "Έως ημερ/νία"
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr "Εβδομάδα"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -391,14 +557,25 @@ msgid "Current Status"
 msgstr "Παρούσα Κατάσταση"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
-msgstr "Τιμολόγιο στο Φύλλο Xρόνου Eργασίας"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
-msgstr "Τιμολόγιο με βάση το Φύλλο Xρόνου Eργασίας"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr "Χρήστης"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
@@ -406,30 +583,81 @@ msgid "Timesheet by Account"
 msgstr "Φύλλο Xρόνου Eργασίας ανά Λογαριασμό"
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr "Ημερ/νία"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
-msgstr "Χρήστης"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
-msgstr "Δημιουργεί τιμολόγιο με βάση Φύλλο Xρόνου Eργασίας"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
-msgstr "Φύλλα Xρόνου Eργασίας για Επικύρωση"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
-msgstr "Επιτρεπόμενη διαφορά Φύλλου Xρόνου Eργασίας"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+"Δεν μπορείτε να κάνετε τροποποιήσεις σε επιβεβαιωμένους Xρόνους Eργασίας!"
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -437,25 +665,47 @@ msgstr "Επιτρεπόμενη διαφορά Φύλλου Xρόνου Eργα
 msgid "Period"
 msgstr "Περίοδος"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr "Έγινε"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
-msgstr "Εγγραφές κινήσεων παρουσιολογίου στο Φύλλο Xρόνου Eργασίας"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
-msgstr "Δημιουργεί το αναλυτικό κόστος σας με βάση την ποσότητα"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
-msgstr "Γραμμή Φύλλου Xρόνου Eργασίας"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -463,32 +713,59 @@ msgid "Timesheet by Accounts"
 msgstr "Φύλλο Xρόνου Eργασίας ανά Λογαριασμό"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr "Τα επιβεβαιωμένα φύλλα δεν μπορούν να διαγραφούν!"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
 msgstr ""
-"Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες!"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
-msgstr "Το Φύλλο Xρόνου Eργασίας επικυρώνεται από τη Διεύθυνση Έργου"
+#: help:hr_timesheet_sheet.sheet,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
-msgstr "Χρόνος τηλεφωνημάτων"
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
-msgstr "Επικύρωση Φύλλου"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
-msgstr "Φύλλα Xρόνου Eργασίας του Τμήματός μου για Επιβεβαίωση"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Γραμμή Φύλλου Xρόνου Eργασίας"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -498,25 +775,55 @@ msgid "Attendances"
 msgstr "Παρουσίες"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
-msgstr "Δημιουργία Αναλυικού κόστους"
-
-#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,name:0
 #: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
 msgid "Description"
 msgstr "Περιγραφή"
 
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign Out"
 msgstr "Αποχώρηση"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr "Ανά Ημέρα"
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -524,30 +831,37 @@ msgstr "Ανά Ημέρα"
 msgid "Difference"
 msgstr "Διαφορά"
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr "hr_timesheet_sheet.sheet"
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr "Απών/ούσα`"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
-msgstr "Στο τέλος περιόδου (εβδομάδα/μήνας)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
-msgstr "η εγγραφή Χρόνου Εργασίας είναι Πρόχειρη"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
-msgstr "Το Αναλυτικό κόστος δημιουργήθηκε"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -555,14 +869,14 @@ msgid "Invoice rate"
 msgstr "Τιμή χρέωσης τιμολογίου"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
-msgstr "Κωδικοποίηση χρόνου ομιλίας στο τηλέφωνο"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
+msgstr "Τιμολόγηση με βάση την εργασία"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
-msgstr "Επισκόπηση της εργασίας σας στο τέλος ημέρας"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -570,88 +884,244 @@ msgid "Analytic accounts"
 msgstr "Αναλυτικοί Λογαριασμοί"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
-msgstr "Τα Φύλλα Xρόνου Eργασίας μου"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
-msgstr "Αποδοχή"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr "Τρέχουσα ημερ/νία"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
-msgstr "Μη επικυρωμένα Φύλλα Xρόνου Eργασίας"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr "Έτος"
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr "Σύνολο"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
-msgstr "Τα Φύλλα Xρόνου Eργασίας του Τμήματός μου για Επικύρωση"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr ""
 
-#, python-format
-#~ msgid "No employee defined for your user !"
-#~ msgstr "Δεν έχει οριστεί υπάλληλος για το χρήστη σας!"
+#~ msgid "Review end of day check day is complete"
+#~ msgstr "Επισκόπηση τέλους ημέρας, έλεγχος ολοκλήρωσης ημέρας"
 
-#, python-format
-#~ msgid "UserError"
-#~ msgstr "UserError"
+#~ msgid "My timesheets to confirm"
+#~ msgstr "Φύλλα Xρόνου Eργασίας μου προς επιβεβαίωση"
 
-#, python-format
-#~ msgid "You can not sign in from an other date than today"
+#~ msgid "Timeshet range"
+#~ msgstr "Διάστημα Φύλλου Xρόνου Eργασίας"
+
+#~ msgid "Confirm timesheet sheet"
+#~ msgstr "Επιβεβαίωση Φύλλου Xρόνου Eργασίας"
+
+#~ msgid "Defines employee's timesheet entry"
+#~ msgstr "Ορίζει τις εγγραφές Φύλλου Xρόνου Eργασίας"
+
+#~ msgid "Draft Timesheet sheet"
+#~ msgstr "Πρόχειρο Φύλλο Xρόνου Eργασίας"
+
+#~ msgid "My Current Timesheet"
+#~ msgstr "Τρέχον Φύλλο Xρόνου Eργασίας"
+
+#~ msgid "Validated Timesheet"
+#~ msgstr "Επικυρωμένο Φύλλο Xρόνου Eργασίας"
+
+#~ msgid "You must select a Current date wich is in the timesheet dates !"
 #~ msgstr ""
-#~ "Δεν μπορέιτε να προσέλθετε για εργασία σε άλλη ημερ/νία από τη σημερινή"
+#~ "Πρέπει να επιλέξετε τρέχουσα ημερ/νία που να περιέχεται στο Φύλλο Xρόνου "
+#~ "Eργασίας!"
 
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Προσοχή!"
+#~ msgid "Total Difference"
+#~ msgstr "Σύνολο Διαφοράς"
 
-#, python-format
-#~ msgid "Error !"
-#~ msgstr "Σφάλμα!"
+#~ msgid "Phone call encoding"
+#~ msgstr "Κωδικοποίηση τηλεφωνημάτων"
+
+#~ msgid "Timesheet by Day"
+#~ msgstr "Φύλλο Xρόνου Eργασίας ανά Ημέρα"
+
+#~ msgid "Defines the task work entry into timesheet line"
+#~ msgstr "Ορίζει την εγγραφή εργασίας στη γραμμή Φύλλου Xρόνου Eργασίας"
 
-#, python-format
 #~ msgid ""
-#~ "Please verify that the total difference of the sheet is lower than %.2f !"
+#~ "Allowed difference between the sign in/out and the timesheet computation for "
+#~ "one sheet. Set this to 0 if you do not want any control."
 #~ msgstr ""
-#~ "Παρακαλώ επιβεβαιώστε ότι η συνολική διαφορά του φύλλου είναι μικρότερη από "
-#~ "%.2f !"
+#~ "Επιτρεπόμενη διαφορά μεταξύ Προσέλευσης και υπολογισμού Xρόνου Eργασίας για "
+#~ "ένα φύλλο. Αν δεν επιθυμείτε τον έλεγχο αυτό, ορίστε τιμή 0."
 
-#, python-format
-#~ msgid "Invalid action !"
-#~ msgstr "Μη επιτρεπόμενη ενέργεια!"
+#~ msgid "Timesheet by Days"
+#~ msgstr "Φύλλο Xρόνου Eργασίας ανά Ημέρες"
 
-#, python-format
-#~ msgid "You can not sign out from an other date than today"
-#~ msgstr "Δεν μπορείτε να αποχωρήσετε άλλη ημέρα παρά μόνο σήμερα!"
+#~ msgid "timesheet is confirmed at the end of the week / month"
+#~ msgstr "το Φύλλο Xρόνου Eργασίας επιβεβαιώνεται στο τέλος εβδομάδας / μήνα"
 
-#, python-format
-#~ msgid "You can not modify an entry in a confirmed timesheet !"
+#~ msgid "Hr Timesheet Process"
+#~ msgstr "Διαδικασία Χρόνου Εργασίας Ανθρώπινου Δυναμικού"
+
+#~ msgid "Analytic cost"
+#~ msgstr "Αναλυτικό Κόστος"
+
+#~ msgid "Encode your timesheet line"
+#~ msgstr "Κωδικοποίηση γραμμής Φύλλου Xρόνου Eργασίας"
+
+#~ msgid "Confirm Timesheet"
+#~ msgstr "Επιβεβαίωση Φύλλου Xρόνου Eργασίας"
+
+#~ msgid "Control by the project manager"
+#~ msgstr "Έλεγχος από τη Διεύθυνση Έργου"
+
+#~ msgid "Timesheet sheet confirm at the end of the period"
+#~ msgstr "Επιβεβαίωση Φύλλου Xρόνου Eργασίας στο τέλος της περιόδου"
+
+#~ msgid "Confirm timesheet at the end of the period"
+#~ msgstr "Επιβεβαίωση Χρόνου Εργασίας στο τέλος περιόδου!"
+
+#~ msgid "Confirmed Timesheet"
+#~ msgstr "Επιβεβαιωμένο Φύλλο Xρόνου Eργασίας"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalid XML for View Architecture!"
+
+#~ msgid "Timesheets by period"
+#~ msgstr "Φύλλα Xρόνου Eργασίας ανά περίοδο"
+
+#~ msgid "My Department's Timesheet"
+#~ msgstr "Φύλλο Xρόνου Eργασίας του τμήματός μου"
+
+#~ msgid "Phone call"
+#~ msgstr "Τηλεφώνημα"
+
+#~ msgid "Review of work"
+#~ msgstr "Επισκόπηση εργασίας"
+
+#~ msgid "Encode Your hours and Sign in / out"
+#~ msgstr "Κωδικοποίηση ωρών και Προσελεύσεων / Αποχωρήσεων"
+
+#~ msgid "Review"
+#~ msgstr "Επισκόπηση"
+
+#~ msgid "Timesheets To Confirm"
+#~ msgstr "Φύλλα Xρόνου Eργασίας προς Επιβεβαίωση"
+
+#~ msgid "Status"
+#~ msgstr "Κατάσταση"
+
+#~ msgid "Invoice on timesheet"
+#~ msgstr "Τιμολόγιο στο Φύλλο Xρόνου Eργασίας"
+
+#~ msgid "Invoice based on timesheet"
+#~ msgstr "Τιμολόγιο με βάση το Φύλλο Xρόνου Eργασίας"
+
+#~ msgid "Creates invoice based on timesheet"
+#~ msgstr "Δημιουργεί τιμολόγιο με βάση Φύλλο Xρόνου Eργασίας"
+
+#~ msgid "Timesheets To Validate"
+#~ msgstr "Φύλλα Xρόνου Eργασίας για Επικύρωση"
+
+#~ msgid "Timesheet allowed difference"
+#~ msgstr "Επιτρεπόμενη διαφορά Φύλλου Xρόνου Eργασίας"
+
+#~ msgid "Attendance entry moves into the timesheet"
+#~ msgstr "Εγγραφές κινήσεων παρουσιολογίου στο Φύλλο Xρόνου Eργασίας"
+
+#~ msgid "Creates your analytic cost accoording to quantity"
+#~ msgstr "Δημιουργεί το αναλυτικό κόστος σας με βάση την ποσότητα"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
-#~ "Δεν μπορείτε να κάνετε τροποποιήσεις σε επιβεβαιωμένους Xρόνους Eργασίας!"
+#~ "Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες!"
 
-#, python-format
-#~ msgid "Cannot delete Sheet(s) which are already confirmed !"
-#~ msgstr "Τα επιβεβαιωμένα φύλλα δεν μπορούν να διαγραφούν!"
+#~ msgid "Timesheet is validate by project manager."
+#~ msgstr "Το Φύλλο Xρόνου Eργασίας επικυρώνεται από τη Διεύθυνση Έργου"
+
+#~ msgid "Whatever time u spent for phone call"
+#~ msgstr "Χρόνος τηλεφωνημάτων"
+
+#~ msgid "Validate Timesheet"
+#~ msgstr "Επικύρωση Φύλλου"
+
+#~ msgid "My Department's Timesheet to Confirm"
+#~ msgstr "Φύλλα Xρόνου Eργασίας του Τμήματός μου για Επιβεβαίωση"
+
+#~ msgid "Create Analytic cost"
+#~ msgstr "Δημιουργία Αναλυικού κόστους"
 
 #, python-format
 #~ msgid "You can not duplicate a timesheet !"
 #~ msgstr "Το Φύλλο υπάρχει ήδη!"
+
+#~ msgid "hr_timesheet_sheet.sheet"
+#~ msgstr "hr_timesheet_sheet.sheet"
+
+#~ msgid "At the end of the period (week/month)"
+#~ msgstr "Στο τέλος περιόδου (εβδομάδα/μήνας)"
+
+#~ msgid "timesheet entry is into draft state."
+#~ msgstr "η εγγραφή Χρόνου Εργασίας είναι Πρόχειρη"
+
+#~ msgid "Analytic cost is created"
+#~ msgstr "Το Αναλυτικό κόστος δημιουργήθηκε"
+
+#~ msgid "Encode how much time u spent on phone call"
+#~ msgstr "Κωδικοποίηση χρόνου ομιλίας στο τηλέφωνο"
+
+#~ msgid "Review of your work at the end of the day"
+#~ msgstr "Επισκόπηση της εργασίας σας στο τέλος ημέρας"
+
+#~ msgid "My timesheets"
+#~ msgstr "Τα Φύλλα Xρόνου Eργασίας μου"
+
+#~ msgid "Accept"
+#~ msgstr "Αποδοχή"
+
+#~ msgid "Unvalidated Timesheets"
+#~ msgstr "Μη επικυρωμένα Φύλλα Xρόνου Eργασίας"
+
+#~ msgid "My Department's Timesheet to Validate"
+#~ msgstr "Τα Φύλλα Xρόνου Eργασίας του Τμήματός μου για Επικύρωση"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
diff --git a/addons/hr_timesheet_sheet/i18n/es.po b/addons/hr_timesheet_sheet/i18n/es.po
index 14ffb244b67..ff1fcb6c68f 100644
--- a/addons/hr_timesheet_sheet/i18n/es.po
+++ b/addons/hr_timesheet_sheet/i18n/es.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-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/es_AR.po b/addons/hr_timesheet_sheet/i18n/es_AR.po
index b5bdfdc61bb..4ecc8edfa4a 100644
--- a/addons/hr_timesheet_sheet/i18n/es_AR.po
+++ b/addons/hr_timesheet_sheet/i18n/es_AR.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-23 20:21+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr "Revisar final del día que la comprobación del día está completa"
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -40,27 +37,41 @@ msgid "Sheet"
 msgstr "Hoja"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr "¡No se ha definido un empleado para su usuario!"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr "Total servicio"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
-msgstr "Mis hojas de servicios a confirmar"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
-msgstr "Rango hoja de servicios"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -68,15 +79,37 @@ msgid "Today"
 msgstr "Hoy"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
-msgstr "Confirmar hoja de servicios"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
+msgstr ""
+"¡Por favor, verifique que la diferencia total de la hoja de servicios es "
+"menor que %.2f!"
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr "Hoja de tareas"
 
@@ -86,20 +119,15 @@ msgid "Set to Draft"
 msgstr "Establecer como Borrador"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
-msgstr "Define entrada hoja de servicios del empleado"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "Fecha hasta"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr "Hoja de servicios borrador"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
-msgstr "Mi hoja de servicios actual"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -107,7 +135,11 @@ msgid "Validate"
 msgstr "Validar"
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr "Día"
 
@@ -116,6 +148,17 @@ msgstr "Día"
 msgid "Present"
 msgstr "Presente"
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr "UserError"
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -123,59 +166,57 @@ msgid "Refuse"
 msgstr "Rechazar"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr "Hoja de servicios validada"
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-"¡Debe seleccionar una fecha actual que esté en las fechas de la hoja de "
-"servicios!"
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr "Diferencia total"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr "Codificación llamada telefónica"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr "Hoja de servicios por día"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr "Define la tarea de trabajo en línea hoja de servicios"
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
-"Diferencia permitida entre el registro de entrada/salida y el cálculo del "
-"tiempo para una hoja de servicio. Establezca su valor a 0 si no quiere "
-"ningún control."
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
-msgstr "Hoja de servicios por días"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
-msgstr "Hoja de servicios es confirmada al final de la semana / mes"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
+msgstr "No puede registrar entrada en otra fecha que no sea hoy"
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Atención !"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr "Cuenta Analítica"
 
@@ -184,30 +225,46 @@ msgstr "Cuenta Analítica"
 msgid "Project Timesheet"
 msgstr "Hoja de tareas del proyecto"
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr "Fecha desde"
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
-msgstr "Proceso hoja de asistencia RH"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
-msgstr "Costo analítico"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "Hojas de tareas"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr "Confirmada"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr "Asistencia"
 
@@ -223,29 +280,44 @@ msgid "Timesheet lines"
 msgstr "Líneas hoja de servicios"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
-msgstr "Codifica su línea de hoja de servicios"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
-msgstr "Confirmar hoja de servicios"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
-msgstr "Control por el responsable del proyecto"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr "Nuevo"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
-msgstr "Hoja de servicios confirmada al final del periodo"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
@@ -258,9 +330,20 @@ msgid "Timesheet Lines"
 msgstr "Líneas de la hoja de asistencia"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
-msgstr "Confirmar hoja de tareas al final del periodo"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -268,9 +351,21 @@ msgid "No employee defined"
 msgstr "No hay empleado definido"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
-msgstr "Hoja de servicios confirmada"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
@@ -278,14 +373,17 @@ msgid "Configuration"
 msgstr "Configuración"
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
-msgstr "Semana"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -293,10 +391,21 @@ msgid "Daily View"
 msgstr "Vista diaria"
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
-msgstr "Hojas de servicios por período"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr "Total hoja de tareas"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -304,10 +413,15 @@ msgid "Sign In"
 msgstr "Registrar entrada"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
-msgstr "Hoja de servicios de mi departamento"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -315,73 +429,123 @@ msgid "Go to:"
 msgstr "Ir a:"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
-msgstr "Llamada telefónica"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
-msgstr "Total hoja de tareas"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr "Revisión de trabajo"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
-msgstr "Facturar sobre trabajo"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr "Mes"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr "Codificar sus horas y registrar entrada/salida"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr "Revisión"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Draft"
 msgstr "Borrador"
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
-msgstr "Hojas de tareas"
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
-msgstr "Hojas de servicios a confirmar"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr "No puede registrar salida en otra fecha que no sea hoy"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
-msgstr "Estado"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
-msgstr "Fecha hasta"
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr "Semana"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -389,14 +553,25 @@ msgid "Current Status"
 msgstr "Estado actual"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
-msgstr "Facturar sobre hoja de servicios"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
+msgstr "¡No puede modificar una entrada en una hoja de servicios confirmada!"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
-msgstr "Factura basada en hoja de servicios"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr "Usuario"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
@@ -404,30 +579,80 @@ msgid "Timesheet by Account"
 msgstr "Hoja de tareas por cuenta"
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr "Fecha"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
-msgstr "Usuario"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
-msgstr "Crea factura basada en hoja de servicios"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
-msgstr "Hojas de servicios a validar"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
-msgstr "Diferencia permitida hoja de servicios"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr "¡No puede modificar una entrada en una hoja de servicios confirmada!"
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -435,25 +660,47 @@ msgstr "Diferencia permitida hoja de servicios"
 msgid "Period"
 msgstr "Período"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr "Realizado"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
-msgstr "Movimiento de entrada de asistencia en hoja de tareas"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
-msgstr "Crea su coste analítico acorde con cantidad"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
-msgstr "Linea de hoja de tareas"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -461,33 +708,59 @@ msgid "Timesheet by Accounts"
 msgstr "Hoja de servicios por cuentas"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr "¡No se puede(n) eliminar hoja(s) que ya está(n) confirmada(s)!"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
 msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
-"especial!"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
-msgstr "Hoja de servicios es validada por el responsable del proyecto"
+#: help:hr_timesheet_sheet.sheet,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
-msgstr "Cualquier tiempo que dedique a la llamada telefónica"
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
-msgstr "Validar hoja de servicios"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
-msgstr "Hoja de tareas de mi departamento a confirmar"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Linea de hoja de tareas"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -497,25 +770,55 @@ msgid "Attendances"
 msgstr "Asistencias"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
-msgstr "Crear costo analítico"
-
-#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,name:0
 #: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
 msgid "Description"
 msgstr "Descripción"
 
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign Out"
 msgstr "Registrar salida"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr "Por día"
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -523,30 +826,37 @@ msgstr "Por día"
 msgid "Difference"
 msgstr "Diferencia"
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr "Hoja de servicios"
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr "Ausente"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
-msgstr "Al final del periodo (semana/mes)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
-msgstr "entrada hoja de servicios está en estado borrador."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
-msgstr "Coste analítico es creado"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -554,14 +864,14 @@ msgid "Invoice rate"
 msgstr "Tarifa de la factura"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
-msgstr "Codifica cuanto tiempo dedica en llamadas telefónicas"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
+msgstr "Facturar sobre trabajo"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
-msgstr "Revisar su trabajo al final del día"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -569,39 +879,61 @@ msgid "Analytic accounts"
 msgstr "Cuentas analíticas"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
-msgstr "Mis hojas de servicios"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
-msgstr "Aceptar"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr "Fecha actual"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
-msgstr "Hojas de servicios no validadas"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr "Año"
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr "Total"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
-msgstr "Hoja de servicios de mi departamento a validar"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr ""
diff --git a/addons/hr_timesheet_sheet/i18n/et.po b/addons/hr_timesheet_sheet/i18n/et.po
index 74993f368bf..7fbd4a6f0ad 100644
--- a/addons/hr_timesheet_sheet/i18n/et.po
+++ b/addons/hr_timesheet_sheet/i18n/et.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 17:45+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr ""
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -37,27 +34,41 @@ msgid "Sheet"
 msgstr "Leht"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr "Kogu kohalviibimine"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
-msgstr "Minu tööajaleht kinnitamiseks"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
-msgstr "Tööajalehe ulatus"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -65,15 +76,35 @@ msgid "Today"
 msgstr "Täna"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
-msgstr "Kinnita tööajalehe leht"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr "Ajagraafik"
 
@@ -83,20 +114,15 @@ msgid "Set to Draft"
 msgstr "Sea mustandiks"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
-msgstr "Määrab töötaja tööajalehe kirje"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "Kuupäevani"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr "Tööajalehe lehe mustand"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
-msgstr "Minu käesolev tööajaleht"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -104,7 +130,11 @@ msgid "Validate"
 msgstr "Valideeri"
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr "Päev"
 
@@ -113,6 +143,17 @@ msgstr "Päev"
 msgid "Present"
 msgstr "Kohal"
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr "KasutajaViga"
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -120,54 +161,57 @@ msgid "Refuse"
 msgstr "Keeldu"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr "Valideeritud tööajaleht"
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr "Kogu erinevus"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr "Telefonikõne arvutamine"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr "Tööajaleht päeva kaupa"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
-msgstr "Tööajaleht päevade kaupa"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
-msgstr "tööajaleht kinnitatakse nädala/kuu lõpus"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr "Analüütiline konto"
 
@@ -176,30 +220,46 @@ msgstr "Analüütiline konto"
 msgid "Project Timesheet"
 msgstr "Projekti tööajaleht"
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr "Kuupäevast"
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
-msgstr "Analüütiline kulu"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "Tööajalehed"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr "Kinnitatud"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr "Kohalviibimine"
 
@@ -215,29 +275,44 @@ msgid "Timesheet lines"
 msgstr "Tööajalehe read"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
-msgstr "Arvuta oma tööajalehe rida"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
-msgstr "Kinnita tööajaleht"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr "Uus"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
-msgstr "Tööajalehe lehe kinnitamine perioodi lõpus"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
+msgstr "Viga !"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
@@ -250,9 +325,20 @@ msgid "Timesheet Lines"
 msgstr "Tööajalehe read"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
-msgstr "Kinnita tööajaleht perioodi lõpus"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -260,9 +346,21 @@ msgid "No employee defined"
 msgstr "Ühtegi töötajat pole määratud"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
-msgstr "Kinnitatud tööajaleht"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
@@ -270,14 +368,17 @@ msgid "Configuration"
 msgstr "Seadistus"
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
-msgstr "Nädal"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -285,10 +386,21 @@ msgid "Daily View"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
-msgstr "Tööajalehed perioodi kaupa"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -296,10 +408,15 @@ msgid "Sign In"
 msgstr "Logi sisse"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
-msgstr "Minu osakonna tööajaleht"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -307,73 +424,123 @@ msgid "Go to:"
 msgstr "Mine:"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
-msgstr "Telefonikõne"
-
-#. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
-msgstr "Arve tööle"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr "Kuu"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr "Ülevaade"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Draft"
 msgstr "Mustand"
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
-msgstr "Tööajalehed"
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
-msgstr "Tööajalehed kinnitamiseks"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
-msgstr "Staatus"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
-msgstr "Kuupäevani"
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr "Nädal"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -381,14 +548,25 @@ msgid "Current Status"
 msgstr "Praegune staatus"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
-msgstr "Arve tööajalehele"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
-msgstr "Arve tööajalehe põhjal"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr "Kasutaja"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
@@ -396,30 +574,80 @@ msgid "Timesheet by Account"
 msgstr "Tööajakaart konto järgi"
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr "Kuupäev"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
-msgstr "Kasutaja"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
-msgstr "Loob arve tööajalehe põhjal"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
-msgstr "Tööajalehed valideerida"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
-msgstr "Tööajalehe lubatud erinevus"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -427,25 +655,47 @@ msgstr "Tööajalehe lubatud erinevus"
 msgid "Period"
 msgstr "Periood"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr "Tehtud"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
-msgstr "Tööajalehe rida"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -453,32 +703,59 @@ msgid "Timesheet by Accounts"
 msgstr "Tööajaleht kontode kaupa"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
 msgstr ""
-"Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
-msgstr "Tööajaleht on valideeritud projektijuhi poolt."
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
-msgstr "Aeg, mis sa kulutasid telefonikõnele."
+#: help:hr_timesheet_sheet.sheet,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
-msgstr "Valideeri tööajaleht"
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
-msgstr "Minu osakonna tööajaleht kinnitada"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Tööajalehe rida"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -488,25 +765,55 @@ msgid "Attendances"
 msgstr "Kohalviibimised"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
-msgstr "Loo analüütiline kulu"
-
-#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,name:0
 #: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
 msgid "Description"
 msgstr "Kirjeldus"
 
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign Out"
 msgstr "Logi välja"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr "Päeva kaupa"
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -514,30 +821,37 @@ msgstr "Päeva kaupa"
 msgid "Difference"
 msgstr "Erinevus"
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr "hr_timesheet_sheet.sheet"
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr "Puudub"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
-msgstr "Perioodi lõpus (nädal/kuu)"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
-msgstr "Analüütiline kulu on loodud"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -545,13 +859,13 @@ msgid "Invoice rate"
 msgstr "Arve määr"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
-msgstr "Arvuta aeg, mis sa kulutasid telefonikõnele"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
+msgstr "Arve tööle"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -560,39 +874,198 @@ msgid "Analytic accounts"
 msgstr "Analüütilised kontod"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
-msgstr "Minu tööajalehed"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
-msgstr "Nõustu"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr "Praegune kuupäev"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
-msgstr "Valideerimata tööajalehed"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr "Aasta"
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr "Kokku"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
-msgstr "Minu osakonna tööajalehed valideerida"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Vigane XML vaate arhitektuurile!"
+
+#~ 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 model name in the action definition."
+#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
+
+#~ msgid "Defines employee's timesheet entry"
+#~ msgstr "Määrab töötaja tööajalehe kirje"
+
+#~ msgid "Draft Timesheet sheet"
+#~ msgstr "Tööajalehe lehe mustand"
+
+#~ msgid "My Current Timesheet"
+#~ msgstr "Minu käesolev tööajaleht"
+
+#~ msgid "Confirm timesheet sheet"
+#~ msgstr "Kinnita tööajalehe leht"
+
+#~ msgid "Timeshet range"
+#~ msgstr "Tööajalehe ulatus"
+
+#~ msgid "My timesheets to confirm"
+#~ msgstr "Minu tööajaleht kinnitamiseks"
+
+#~ msgid "Validated Timesheet"
+#~ msgstr "Valideeritud tööajaleht"
+
+#~ msgid "Timesheet by Days"
+#~ msgstr "Tööajaleht päevade kaupa"
+
+#~ msgid "Phone call encoding"
+#~ msgstr "Telefonikõne arvutamine"
+
+#~ msgid "Total Difference"
+#~ msgstr "Kogu erinevus"
+
+#~ msgid "Timesheet by Day"
+#~ msgstr "Tööajaleht päeva kaupa"
+
+#~ msgid "Encode your timesheet line"
+#~ msgstr "Arvuta oma tööajalehe rida"
+
+#~ msgid "Analytic cost"
+#~ msgstr "Analüütiline kulu"
+
+#~ msgid "timesheet is confirmed at the end of the week / month"
+#~ msgstr "tööajaleht kinnitatakse nädala/kuu lõpus"
+
+#~ msgid "Confirm Timesheet"
+#~ msgstr "Kinnita tööajaleht"
+
+#~ msgid "Timesheet sheet confirm at the end of the period"
+#~ msgstr "Tööajalehe lehe kinnitamine perioodi lõpus"
+
+#~ msgid "Confirm timesheet at the end of the period"
+#~ msgstr "Kinnita tööajaleht perioodi lõpus"
+
+#~ msgid "Confirmed Timesheet"
+#~ msgstr "Kinnitatud tööajaleht"
+
+#~ msgid "Phone call"
+#~ msgstr "Telefonikõne"
+
+#~ msgid "Timesheets by period"
+#~ msgstr "Tööajalehed perioodi kaupa"
+
+#~ msgid "My Department's Timesheet"
+#~ msgstr "Minu osakonna tööajaleht"
+
+#~ msgid "Status"
+#~ msgstr "Staatus"
+
+#~ msgid "Timesheets To Confirm"
+#~ msgstr "Tööajalehed kinnitamiseks"
+
+#~ msgid "Review"
+#~ msgstr "Ülevaade"
+
+#~ msgid "Timesheets To Validate"
+#~ msgstr "Tööajalehed valideerida"
+
+#~ msgid "Timesheet allowed difference"
+#~ msgstr "Tööajalehe lubatud erinevus"
+
+#~ msgid "Invoice on timesheet"
+#~ msgstr "Arve tööajalehele"
+
+#~ msgid "Invoice based on timesheet"
+#~ msgstr "Arve tööajalehe põhjal"
+
+#~ msgid "Creates invoice based on timesheet"
+#~ msgstr "Loob arve tööajalehe põhjal"
+
+#~ msgid "Whatever time u spent for phone call"
+#~ msgstr "Aeg, mis sa kulutasid telefonikõnele."
+
+#~ msgid "Timesheet is validate by project manager."
+#~ msgstr "Tööajaleht on valideeritud projektijuhi poolt."
+
+#~ msgid "Validate Timesheet"
+#~ msgstr "Valideeri tööajaleht"
+
+#~ msgid "Create Analytic cost"
+#~ msgstr "Loo analüütiline kulu"
+
+#~ msgid "My Department's Timesheet to Confirm"
+#~ msgstr "Minu osakonna tööajaleht kinnitada"
+
+#~ msgid "hr_timesheet_sheet.sheet"
+#~ msgstr "hr_timesheet_sheet.sheet"
+
+#~ msgid "My timesheets"
+#~ msgstr "Minu tööajalehed"
+
+#~ msgid "Encode how much time u spent on phone call"
+#~ msgstr "Arvuta aeg, mis sa kulutasid telefonikõnele"
+
+#~ msgid "Analytic cost is created"
+#~ msgstr "Analüütiline kulu on loodud"
+
+#~ msgid "At the end of the period (week/month)"
+#~ msgstr "Perioodi lõpus (nädal/kuu)"
+
+#~ msgid "Accept"
+#~ msgstr "Nõustu"
+
+#~ msgid "My Department's Timesheet to Validate"
+#~ msgstr "Minu osakonna tööajalehed valideerida"
+
+#~ msgid "Unvalidated Timesheets"
+#~ msgstr "Valideerimata tööajalehed"
diff --git a/addons/hr_timesheet_sheet/i18n/fi.po b/addons/hr_timesheet_sheet/i18n/fi.po
index 2b55638bdb5..24d898bff1f 100644
--- a/addons/hr_timesheet_sheet/i18n/fi.po
+++ b/addons/hr_timesheet_sheet/i18n/fi.po
@@ -7,23 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 06:27+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: Finnish <fi@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:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr "Tarkista päivän lopussa, että päivä on valmis"
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -41,27 +38,41 @@ msgid "Sheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr "Läsnä kaikkiaan"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
-msgstr "Omat vahvistettavat tuntilistat"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
-msgstr "Tuntilistan laajuus"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -69,15 +80,35 @@ msgid "Today"
 msgstr "Tänään"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
-msgstr "Vahvista tuntilistan taulukko"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr "Tuntilista"
 
@@ -87,20 +118,15 @@ msgid "Set to Draft"
 msgstr "Aseta luonnokseksi"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
-msgstr "Määrittää työntekijän tuntilistan kohteen"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "Päivämäärä"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr "Vedosta tuntilistan taulukko"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
-msgstr "Oma tuntilista"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -108,7 +134,11 @@ msgid "Validate"
 msgstr "Vahvista"
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr "Päivä"
 
@@ -117,6 +147,17 @@ msgstr "Päivä"
 msgid "Present"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -124,57 +165,57 @@ msgid "Refuse"
 msgstr "Hylkää"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr "Tarkistettu tuntilista"
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr "Sinun on valittava se päivämäärä mikä on tuntilistan päivämäärissä!"
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr "Lopullinen erotus"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr "Puhelimen käyttö"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr "Tuntilista päivämäärän mukaan"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr "Määrittää työtehtävän kohdan tuntilistan riville"
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
-"Sallittu aikaero sisäänkirjautumisen ja uloskirjautumisen välillä ja "
-"tuntilistan laskentä taulukkoa kohden. Aseta tämä 0:ksi jos et halua "
-"kontrollia."
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
-msgstr "Tuntilistat päivien mukaan"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
-msgstr "Tuntilista vahvistetaan viikon lopulla tai kuun lopussa."
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
@@ -183,30 +224,46 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr "Projektin tuntilista"
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr "Päiväys alkaen"
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
-msgstr "Henkilöstön tuntilistaprosessi"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
-msgstr "Analyyttinen kustannus"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "Tuntilistat"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr "Vahvistettu"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr "Läsnäolo"
 
@@ -222,29 +279,44 @@ msgid "Timesheet lines"
 msgstr "Tuntilistan rivit"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
-msgstr "Täytä tuntilistan rivi"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
-msgstr "Hyväksy tuntilista"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
-msgstr "Hallinnoi Projektipäällikkönä"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr "Uusi"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
-msgstr "Tuntilistan taulukon hyväksyminen aikajakson lopulla"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
@@ -257,9 +329,20 @@ msgid "Timesheet Lines"
 msgstr "Tuntilistan rivit"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
-msgstr "Hyväksy tuntilista aikajakson lopulla"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -267,120 +350,201 @@ msgid "No employee defined"
 msgstr "Ei määritettyä työntekijää"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
-msgstr "Vahvistettu tuntilista"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
 msgid "Configuration"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Daily View"
+msgstr "Päivänäkymä"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr "Tuntilistasaldo"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Sign In"
+msgstr "Kirjaudu sisään"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Go to:"
+msgstr "Mene"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
+#: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
+msgid "Month"
+msgstr "Kuukausi"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Draft"
+msgstr "Luonnos"
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
 msgid "Week"
 msgstr "Viikko"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Daily View"
-msgstr "Päivänäkymä"
-
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
-msgstr "Tuntilistat aikajaksottain"
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Sign In"
-msgstr "Kirjaudu sisään"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
-msgstr "Oman osaston tuntilista"
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Go to:"
-msgstr "Mene"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
-msgstr "Puhelinsoitto"
-
-#. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
-msgstr "Tuntilistasaldo"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr "Työn katsaus"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Month"
-msgstr "Kuukausi"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr "Täytä työtuntisi ja kirjaudu sisään/ulos"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr "Katsaus"
-
-#. module: hr_timesheet_sheet
-#: selection:hr_timesheet_sheet.sheet,state:0
-msgid "Draft"
-msgstr "Luonnos"
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
-msgstr "Tuntilistat"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
-msgstr "Vahvistettavat tuntilistat"
-
-#. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
-msgstr "Status"
-
-#. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
-msgstr "Päivämäärä"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -388,14 +552,25 @@ msgid "Current Status"
 msgstr "Nykyinen tila"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
-msgstr "Tuntilistaan perustuva lasku"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr "Käyttäjä"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
@@ -403,30 +578,80 @@ msgid "Timesheet by Account"
 msgstr "Tilinmukainen tuntilista"
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr "Päivämäärä"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
-msgstr "Käyttäjä"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
-msgstr "Luo tuntilistaan perustuvan laskun"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
-msgstr "Tarkistettavat tuntilistat"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
-msgstr "Tuntilistan sallittu erotus"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -434,25 +659,47 @@ msgstr "Tuntilistan sallittu erotus"
 msgid "Period"
 msgstr "Jakso"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr "Valmis"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
-msgstr "Läsnäolot siirtyvät tuntilistaan"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
-msgstr "Luo analyyttiset kustannuksesi määrään perustuen"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
-msgstr "Tuntilistan rivi"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -460,31 +707,59 @@ msgid "Timesheet by Accounts"
 msgstr "Tuntilistat tilien mukaan"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
-msgstr "Projektipäällikkö tarkastaa tuntilistan"
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
-msgstr "Minkä tahansa ajan käytit puhelinsoittoon"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
-msgstr "Tarkasta tuntilista"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
-msgstr "Oman osastoni vahvistettava tuntilista"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Tuntilistan rivi"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -494,25 +769,55 @@ msgid "Attendances"
 msgstr "Läsnäolot"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
-msgstr "Luo analyyttinen kustannus"
-
-#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,name:0
 #: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
 msgid "Description"
 msgstr "Kuvaus"
 
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign Out"
 msgstr "Kirjaudu ulos"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr "Päivän mukaan"
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -520,30 +825,37 @@ msgstr "Päivän mukaan"
 msgid "Difference"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr "Poissaolo"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
-msgstr "Jakson lopussa (viikko/kuukausi)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
-msgstr "tuntilistan kohta on vedostilassa."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
-msgstr "Analyyttinen kustannus on luotu"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -551,14 +863,14 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
-msgstr "Täytä paljonko käytit aikaa puhelinsoittoon"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
-msgstr "Käy läpi työsi päivän loputtua"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -566,39 +878,232 @@ msgid "Analytic accounts"
 msgstr "Analyyttiset tilit"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
-msgstr "Omat tuntilistat"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
-msgstr "Hyväksy"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr "Päivämäärä"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
-msgstr "Tarkastamattomat tuntilistat"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr "Vuosi"
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr "Yhteensä"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
-msgstr "Oman osaston tarkistettava tuntilista"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#~ msgid "My timesheets to confirm"
+#~ msgstr "Omat vahvistettavat tuntilistat"
+
+#~ msgid "Timeshet range"
+#~ msgstr "Tuntilistan laajuus"
+
+#~ msgid "Confirm timesheet sheet"
+#~ msgstr "Vahvista tuntilistan taulukko"
+
+#~ msgid "Review end of day check day is complete"
+#~ msgstr "Tarkista päivän lopussa, että päivä on valmis"
+
+#~ msgid "Validated Timesheet"
+#~ msgstr "Tarkistettu tuntilista"
+
+#~ msgid "Draft Timesheet sheet"
+#~ msgstr "Vedosta tuntilistan taulukko"
+
+#~ msgid "My Current Timesheet"
+#~ msgstr "Oma tuntilista"
+
+#~ msgid "Defines employee's timesheet entry"
+#~ msgstr "Määrittää työntekijän tuntilistan kohteen"
+
+#~ msgid "You must select a Current date wich is in the timesheet dates !"
+#~ msgstr "Sinun on valittava se päivämäärä mikä on tuntilistan päivämäärissä!"
+
+#~ msgid "Timesheet by Day"
+#~ msgstr "Tuntilista päivämäärän mukaan"
+
+#~ msgid "Defines the task work entry into timesheet line"
+#~ msgstr "Määrittää työtehtävän kohdan tuntilistan riville"
+
+#~ msgid "Total Difference"
+#~ msgstr "Lopullinen erotus"
+
+#~ msgid "Timesheet by Days"
+#~ msgstr "Tuntilistat päivien mukaan"
+
+#~ msgid "Phone call encoding"
+#~ msgstr "Puhelimen käyttö"
+
+#~ msgid "timesheet is confirmed at the end of the week / month"
+#~ msgstr "Tuntilista vahvistetaan viikon lopulla tai kuun lopussa."
+
+#~ msgid ""
+#~ "Allowed difference between the sign in/out and the timesheet computation for "
+#~ "one sheet. Set this to 0 if you do not want any control."
+#~ msgstr ""
+#~ "Sallittu aikaero sisäänkirjautumisen ja uloskirjautumisen välillä ja "
+#~ "tuntilistan laskentä taulukkoa kohden. Aseta tämä 0:ksi jos et halua "
+#~ "kontrollia."
+
+#~ msgid "Encode your timesheet line"
+#~ msgstr "Täytä tuntilistan rivi"
+
+#~ msgid "Analytic cost"
+#~ msgstr "Analyyttinen kustannus"
+
+#~ msgid "Control by the project manager"
+#~ msgstr "Hallinnoi Projektipäällikkönä"
+
+#~ msgid "Confirm Timesheet"
+#~ msgstr "Hyväksy tuntilista"
+
+#~ msgid "Hr Timesheet Process"
+#~ msgstr "Henkilöstön tuntilistaprosessi"
+
+#~ msgid "Confirm timesheet at the end of the period"
+#~ msgstr "Hyväksy tuntilista aikajakson lopulla"
+
+#~ msgid "Timesheet sheet confirm at the end of the period"
+#~ msgstr "Tuntilistan taulukon hyväksyminen aikajakson lopulla"
+
+#~ msgid "Confirmed Timesheet"
+#~ msgstr "Vahvistettu tuntilista"
+
+#~ msgid "Timesheets by period"
+#~ msgstr "Tuntilistat aikajaksottain"
+
+#~ msgid "My Department's Timesheet"
+#~ msgstr "Oman osaston tuntilista"
+
+#~ msgid "Phone call"
+#~ msgstr "Puhelinsoitto"
+
+#~ msgid "Review of work"
+#~ msgstr "Työn katsaus"
+
+#~ msgid "Encode Your hours and Sign in / out"
+#~ msgstr "Täytä työtuntisi ja kirjaudu sisään/ulos"
+
+#~ msgid "Timesheets To Confirm"
+#~ msgstr "Vahvistettavat tuntilistat"
+
+#~ msgid "Review"
+#~ msgstr "Katsaus"
+
+#~ msgid "Invoice based on timesheet"
+#~ msgstr "Tuntilistaan perustuva lasku"
+
+#~ msgid "Timesheets To Validate"
+#~ msgstr "Tarkistettavat tuntilistat"
+
+#~ msgid "Timesheet allowed difference"
+#~ msgstr "Tuntilistan sallittu erotus"
+
+#~ msgid "Creates your analytic cost accoording to quantity"
+#~ msgstr "Luo analyyttiset kustannuksesi määrään perustuen"
+
+#~ msgid "Attendance entry moves into the timesheet"
+#~ msgstr "Läsnäolot siirtyvät tuntilistaan"
+
+#~ msgid "Creates invoice based on timesheet"
+#~ msgstr "Luo tuntilistaan perustuvan laskun"
+
+#~ msgid "Timesheet is validate by project manager."
+#~ msgstr "Projektipäällikkö tarkastaa tuntilistan"
+
+#~ msgid "Create Analytic cost"
+#~ msgstr "Luo analyyttinen kustannus"
+
+#~ msgid "My Department's Timesheet to Confirm"
+#~ msgstr "Oman osastoni vahvistettava tuntilista"
+
+#~ msgid "Validate Timesheet"
+#~ msgstr "Tarkasta tuntilista"
+
+#~ msgid "Whatever time u spent for phone call"
+#~ msgstr "Minkä tahansa ajan käytit puhelinsoittoon"
+
+#~ msgid "At the end of the period (week/month)"
+#~ msgstr "Jakson lopussa (viikko/kuukausi)"
+
+#~ msgid "timesheet entry is into draft state."
+#~ msgstr "tuntilistan kohta on vedostilassa."
+
+#~ msgid "Analytic cost is created"
+#~ msgstr "Analyyttinen kustannus on luotu"
+
+#~ msgid "Review of your work at the end of the day"
+#~ msgstr "Käy läpi työsi päivän loputtua"
+
+#~ msgid "Encode how much time u spent on phone call"
+#~ msgstr "Täytä paljonko käytit aikaa puhelinsoittoon"
+
+#~ msgid "Unvalidated Timesheets"
+#~ msgstr "Tarkastamattomat tuntilistat"
+
+#~ msgid "My Department's Timesheet to Validate"
+#~ msgstr "Oman osaston tarkistettava tuntilista"
+
+#~ msgid "My timesheets"
+#~ msgstr "Omat tuntilistat"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Accept"
+#~ msgstr "Hyväksy"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
diff --git a/addons/hr_timesheet_sheet/i18n/fr.po b/addons/hr_timesheet_sheet/i18n/fr.po
index 8443c3e9f00..93dc519648b 100644
--- a/addons/hr_timesheet_sheet/i18n/fr.po
+++ b/addons/hr_timesheet_sheet/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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-12-01 09: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-02 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
@@ -54,11 +54,6 @@ msgstr "Pas d'employé défini pour cet utilisateur !"
 msgid "Group By..."
 msgstr "Regrouper par..."
 
-#. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
@@ -285,8 +280,8 @@ msgid "Timesheet lines"
 msgstr "Lignes des feuilles de présence"
 
 #. module: hr_timesheet_sheet
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -312,11 +307,6 @@ msgstr "Employé"
 msgid "New"
 msgstr "Nouveau"
 
-#. module: hr_timesheet_sheet
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
 msgid "My Total Attendances By Week"
@@ -350,6 +340,11 @@ msgstr "Heures"
 msgid "#Cost"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "No employee defined"
@@ -385,11 +380,6 @@ msgid ""
 "defined !"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue"
-
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
 msgid "Work on Task"
@@ -523,11 +513,6 @@ msgstr "Brouillon"
 msgid "Timesheet allowed difference(Hours)"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #, python-format
@@ -670,12 +655,6 @@ msgstr "Quantité"
 msgid "General Account"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: view:timesheet.report:0
-#: field:timesheet.report,to_invoice:0
-msgid "Type of Invoicing"
-msgstr "Type de facturation"
-
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
 msgid ""
@@ -716,11 +695,6 @@ msgstr "Fait"
 msgid "State is 'draft'."
 msgstr "L'état est 'Brouillon'"
 
-#. module: hr_timesheet_sheet
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Cancel"
@@ -736,22 +710,11 @@ msgstr "Validé"
 msgid "Open"
 msgstr "Ouvrir"
 
-#. module: hr_timesheet_sheet
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Timesheet by Accounts"
 msgstr "Feuille de présence par compte"
 
-#. module: hr_timesheet_sheet
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #, python-format
@@ -924,9 +887,10 @@ msgid "Analytic accounts"
 msgstr "Compte analytique"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr "Type de facturation"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
@@ -1037,6 +1001,9 @@ msgstr ""
 #~ msgid "Confirmed Timesheet"
 #~ msgstr "Feuilles de temps confirmés"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valide pour l'architecture de la vue"
+
 #~ msgid "Timesheets by period"
 #~ msgstr "Feuilles de présence par période"
 
diff --git a/addons/hr_timesheet_sheet/i18n/hr.po b/addons/hr_timesheet_sheet/i18n/hr.po
index 153951ab0dc..1cb7feb75bb 100644
--- a/addons/hr_timesheet_sheet/i18n/hr.po
+++ b/addons/hr_timesheet_sheet/i18n/hr.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr ""
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -37,26 +34,40 @@ msgid "Sheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -65,15 +76,35 @@ msgid "Today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr ""
 
@@ -83,19 +114,14 @@ msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -104,7 +130,11 @@ msgid "Validate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr ""
 
@@ -113,6 +143,17 @@ msgstr ""
 msgid "Present"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -120,54 +161,57 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
@@ -176,30 +220,46 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr ""
 
@@ -215,28 +275,43 @@ msgid "Timesheet lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -250,8 +325,19 @@ msgid "Timesheet Lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -260,8 +346,20 @@ msgid "No employee defined"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -270,13 +368,16 @@ msgid "Configuration"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -285,9 +386,20 @@ msgid "Daily View"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -296,9 +408,14 @@ msgid "Sign In"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -307,72 +424,122 @@ msgid "Go to:"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: selection:hr_timesheet_sheet.sheet,state:0
-msgid "Draft"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
+msgid "In Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -381,13 +548,24 @@ msgid "Current Status"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -396,29 +574,79 @@ msgid "Timesheet by Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -427,24 +655,46 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -453,30 +703,58 @@ msgid "Timesheet by Accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -487,13 +765,26 @@ msgid "Attendances"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,name:0
-msgid "Description"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -501,11 +792,28 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -513,29 +821,36 @@ msgstr ""
 msgid "Difference"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -544,13 +859,13 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -559,39 +874,61 @@ msgid "Analytic accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
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/hu.po b/addons/hr_timesheet_sheet/i18n/hu.po
index 153951ab0dc..3754d4064e9 100644
--- a/addons/hr_timesheet_sheet/i18n/hu.po
+++ b/addons/hr_timesheet_sheet/i18n/hu.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr ""
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -37,26 +34,40 @@ msgid "Sheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -65,15 +76,35 @@ msgid "Today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr ""
 
@@ -83,19 +114,14 @@ msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -104,7 +130,11 @@ msgid "Validate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr ""
 
@@ -113,6 +143,17 @@ msgstr ""
 msgid "Present"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -120,54 +161,57 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
@@ -176,30 +220,46 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr ""
 
@@ -215,28 +275,43 @@ msgid "Timesheet lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -250,8 +325,19 @@ msgid "Timesheet Lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -260,8 +346,20 @@ msgid "No employee defined"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -270,13 +368,16 @@ msgid "Configuration"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -285,9 +386,20 @@ msgid "Daily View"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -296,9 +408,14 @@ msgid "Sign In"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -307,72 +424,122 @@ msgid "Go to:"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: selection:hr_timesheet_sheet.sheet,state:0
-msgid "Draft"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
+msgid "In Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -381,13 +548,24 @@ msgid "Current Status"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -396,29 +574,79 @@ msgid "Timesheet by Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -427,24 +655,46 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -453,30 +703,58 @@ msgid "Timesheet by Accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -487,13 +765,26 @@ msgid "Attendances"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,name:0
-msgid "Description"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -501,11 +792,28 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -513,29 +821,36 @@ msgstr ""
 msgid "Difference"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -544,13 +859,13 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -559,39 +874,61 @@ msgid "Analytic accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
diff --git a/addons/hr_timesheet_sheet/i18n/id.po b/addons/hr_timesheet_sheet/i18n/id.po
index 3bb58e497bb..dbaed9fea6a 100644
--- a/addons/hr_timesheet_sheet/i18n/id.po
+++ b/addons/hr_timesheet_sheet/i18n/id.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-09 13:50+0000\n"
 "Last-Translator: <>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr ""
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -37,26 +34,40 @@ msgid "Sheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -65,15 +76,35 @@ msgid "Today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr ""
 
@@ -83,19 +114,14 @@ msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -104,7 +130,11 @@ msgid "Validate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr ""
 
@@ -113,6 +143,17 @@ msgstr ""
 msgid "Present"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -120,54 +161,57 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
@@ -176,30 +220,46 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr ""
 
@@ -215,28 +275,43 @@ msgid "Timesheet lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -250,8 +325,19 @@ msgid "Timesheet Lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -260,8 +346,20 @@ msgid "No employee defined"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -270,13 +368,16 @@ msgid "Configuration"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -285,9 +386,20 @@ msgid "Daily View"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -296,9 +408,14 @@ msgid "Sign In"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -307,72 +424,122 @@ msgid "Go to:"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: selection:hr_timesheet_sheet.sheet,state:0
-msgid "Draft"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
+msgid "In Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -381,13 +548,24 @@ msgid "Current Status"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -396,29 +574,79 @@ msgid "Timesheet by Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -427,24 +655,46 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -453,30 +703,58 @@ msgid "Timesheet by Accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -487,13 +765,26 @@ msgid "Attendances"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,name:0
-msgid "Description"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -501,11 +792,28 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -513,29 +821,36 @@ msgstr ""
 msgid "Difference"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -544,13 +859,13 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -559,39 +874,61 @@ msgid "Analytic accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
diff --git a/addons/hr_timesheet_sheet/i18n/it.po b/addons/hr_timesheet_sheet/i18n/it.po
index dc0a147d8c2..e57472fa956 100644
--- a/addons/hr_timesheet_sheet/i18n/it.po
+++ b/addons/hr_timesheet_sheet/i18n/it.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-29 09: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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr "Verifica di fine giornata, il controllo giornata è completo"
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -39,27 +36,41 @@ msgid "Sheet"
 msgstr "Foglio"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome del modello non valido nella definizione dell'azione."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr "Presenza Totali"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
-msgstr "I Miei Orari di Lavoro da Confermare"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
-msgstr "Orari di Lavoro Da - A"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -67,15 +78,36 @@ msgid "Today"
 msgstr "Oggi"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
-msgstr "Conferma il Foglio Presenza oraria"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
+msgstr ""
+"Per favore verifica che la differenza totale del foglio sia minore di %.2f !"
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr "Orario di Lavoro"
 
@@ -85,20 +117,15 @@ msgid "Set to Draft"
 msgstr "Impost come Bozza"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
-msgstr "Definisce le voci del Foglio Orario degli Impiegati"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "Fino a"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr "Bozza foglio ore"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
-msgstr "I Miei Orari di Lavoro attuali"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -106,7 +133,11 @@ msgid "Validate"
 msgstr "Convalida"
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr "Giorno"
 
@@ -115,6 +146,17 @@ msgstr "Giorno"
 msgid "Present"
 msgstr "Corrente"
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr "Errore utente"
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -122,58 +164,57 @@ msgid "Refuse"
 msgstr "Rifiuta"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr "Convalida il foglio lavoro"
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-"Devi selezionare una data Attuale che è tra le date del foglio lavoro!"
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr "Differenza Totale"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr "Codifica chiamata telefonica"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr "Orari di Lavoro per Giorno"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-"Definisce la voce di attività lavorate nelle righe del foglio di lavoro"
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
-"Differenze permesse tra entrate/uscite e calcolo automatico degli orari di "
-"lavoro su una tabella. Impostare a 0 se non vuoi alcun controllo"
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
-msgstr "Orari di Lavoro per Giorno"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
-msgstr "Il foglio ore è confermato alla fine della settimana / mese"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Attenzione !"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr "Contabilità Analitica"
 
@@ -182,30 +223,46 @@ msgstr "Contabilità Analitica"
 msgid "Project Timesheet"
 msgstr "Orari di Lavoro Progetto"
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr "Data Da"
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
-msgstr "HR Processe per Foglio orario"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
-msgstr "Costo Analitico"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "Orari di Lavoro"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr "Confermato"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr "Presenze"
 
@@ -221,29 +278,44 @@ msgid "Timesheet lines"
 msgstr "Righe Orari di Lavoro"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
-msgstr "Codifica la tua linea del Foglio Orario"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
-msgstr "Conferma il foglio ore"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
-msgstr "Controllato dall'Amministratore Progetto"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr "Nuovo"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
-msgstr "Foglio Orario confermato alla fine del periodo"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
+msgstr "Errore !"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
@@ -256,9 +328,20 @@ msgid "Timesheet Lines"
 msgstr "Righe Orari di Lavoro"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
-msgstr "Conferma il foglio ore alla fine del periodo"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -266,9 +349,21 @@ msgid "No employee defined"
 msgstr "Non è stato definito alcun dipendente"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
-msgstr "Foglio ore confermato"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
@@ -276,14 +371,17 @@ msgid "Configuration"
 msgstr "Configurazione"
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
-msgstr "Settimana"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -291,10 +389,21 @@ msgid "Daily View"
 msgstr "Vista Giornaliero"
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
-msgstr "Orari di Lavoro per Periodo"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr "Orari di Lavoro Totali"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -302,10 +411,15 @@ msgid "Sign In"
 msgstr "Entrata"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
-msgstr "Foglio ore del mio settore"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -313,73 +427,123 @@ msgid "Go to:"
 msgstr "Vai a:"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
-msgstr "Telefonata"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
-msgstr "Orari di Lavoro Totali"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr "Revisione del lavoro"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
-msgstr "Fattura su lavoro"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr "Mese"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr "Codifica le tue ore e le registrazioni di Entrata / Uscita"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr "Revisione"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Draft"
 msgstr "Bozza"
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
-msgstr "Orari di Lavoro"
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
-msgstr "Orari di Lavoro da Confermare"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr "Non è possibile registrare l'uscita in un giorno diverso da oggi"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
-msgstr "Stato"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
-msgstr "Fino a"
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr "Settimana"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -387,14 +551,25 @@ msgid "Current Status"
 msgstr "Stato Attuale"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
-msgstr "Fattura sul foglio ore"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
-msgstr "Fattura basata sul foglio ore"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr "Utente"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
@@ -402,30 +577,82 @@ msgid "Timesheet by Account"
 msgstr "Orari di Lavoro da Contabilità"
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr "Data"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
-msgstr "Utente"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
-msgstr "Crea fattura basata sul foglio ore"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
-msgstr "Orari di Lavoro da convalidare"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
-msgstr "Differenza ammessa in Orari di Lavoro"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+"Non è possibile modificare una registrazione oraria in un foglio ore "
+"confermato!"
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -433,25 +660,47 @@ msgstr "Differenza ammessa in Orari di Lavoro"
 msgid "Period"
 msgstr "Periodo"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr "Completato"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
-msgstr "Voci di presenza spostate nel Foglio Ore"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
-msgstr "Crea il tuo costo analitico in base alla quantità"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
-msgstr "Riga Foglio Orario"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -459,33 +708,59 @@ msgid "Timesheet by Accounts"
 msgstr "Orari di Lavoro da Contabilità"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
 msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
-msgstr "Il foglio ore è validato dal capo progetto"
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
-msgstr "Tempo speso per chiamate telefoniche"
+#: help:hr_timesheet_sheet.sheet,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
-msgstr "Convalida il foglio ore"
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
-msgstr "Foglio ore del mio Dipartimento da convalidare"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Riga Foglio Orario"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -495,25 +770,55 @@ msgid "Attendances"
 msgstr "Presenze"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
-msgstr "Crea costo Analitico"
-
-#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,name:0
 #: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
 msgid "Description"
 msgstr "Descrizione"
 
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign Out"
 msgstr "Uscita"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr "Per Giorno"
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -521,30 +826,37 @@ msgstr "Per Giorno"
 msgid "Difference"
 msgstr "Differenza"
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr "hr_timesheet_sheet.sheet"
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr "Assente"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
-msgstr "Alla fine del periodo (settimana/mese)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
-msgstr "Il foglio ore è in stato di bozza"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
-msgstr "Il costo Analitico è creato"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -552,14 +864,14 @@ msgid "Invoice rate"
 msgstr "Tasso di fatturazione"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
-msgstr "Definisce quanto tempo hai speso in chiamate telefoniche"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
+msgstr "Fattura su lavoro"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
-msgstr "Revisiona il tuo lavoro alla fine del giorno"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -567,39 +879,241 @@ msgid "Analytic accounts"
 msgstr "Contabilità Analitica"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
-msgstr "I Miei Orari di Lavoro"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
-msgstr "Accetto"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr "Data Corrente"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
-msgstr "Orari di Lavoro non Convalidati"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr "Anno"
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr "Totale"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
-msgstr "Foglio ore del mio Dipartimento da convalidare"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#~ msgid "My timesheets to confirm"
+#~ msgstr "I Miei Orari di Lavoro da Confermare"
+
+#~ msgid "Timeshet range"
+#~ msgstr "Orari di Lavoro Da - A"
+
+#~ msgid "Draft Timesheet sheet"
+#~ msgstr "Bozza foglio ore"
+
+#~ msgid "My Current Timesheet"
+#~ msgstr "I Miei Orari di Lavoro attuali"
+
+#~ msgid "Validated Timesheet"
+#~ msgstr "Convalida il foglio lavoro"
+
+#~ msgid "You must select a Current date wich is in the timesheet dates !"
+#~ msgstr ""
+#~ "Devi selezionare una data Attuale che è tra le date del foglio lavoro!"
+
+#~ msgid "Total Difference"
+#~ msgstr "Differenza Totale"
+
+#~ msgid "Timesheet by Day"
+#~ msgstr "Orari di Lavoro per Giorno"
+
+#~ msgid ""
+#~ "Allowed difference between the sign in/out and the timesheet computation for "
+#~ "one sheet. Set this to 0 if you do not want any control."
+#~ msgstr ""
+#~ "Differenze permesse tra entrate/uscite e calcolo automatico degli orari di "
+#~ "lavoro su una tabella. Impostare a 0 se non vuoi alcun controllo"
+
+#~ msgid "Timesheet by Days"
+#~ msgstr "Orari di Lavoro per Giorno"
+
+#~ msgid "timesheet is confirmed at the end of the week / month"
+#~ msgstr "Il foglio ore è confermato alla fine della settimana / mese"
+
+#~ msgid "Analytic cost"
+#~ msgstr "Costo Analitico"
+
+#~ msgid "Confirm Timesheet"
+#~ msgstr "Conferma il foglio ore"
+
+#~ msgid "Confirm timesheet at the end of the period"
+#~ msgstr "Conferma il foglio ore alla fine del periodo"
+
+#~ msgid "Confirmed Timesheet"
+#~ msgstr "Foglio ore confermato"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per Visualizzazione Architettura!"
+
+#~ msgid "Timesheets by period"
+#~ msgstr "Orari di Lavoro per Periodo"
+
+#~ msgid "My Department's Timesheet"
+#~ msgstr "Foglio ore del mio settore"
+
+#~ msgid "Phone call"
+#~ msgstr "Telefonata"
+
+#~ msgid "Review of work"
+#~ msgstr "Revisione del lavoro"
+
+#~ msgid "Review"
+#~ msgstr "Revisione"
+
+#~ msgid "Timesheets To Confirm"
+#~ msgstr "Orari di Lavoro da Confermare"
+
+#~ msgid "Status"
+#~ msgstr "Stato"
+
+#~ msgid "Invoice on timesheet"
+#~ msgstr "Fattura sul foglio ore"
+
+#~ msgid "Invoice based on timesheet"
+#~ msgstr "Fattura basata sul foglio ore"
+
+#~ msgid "Creates invoice based on timesheet"
+#~ msgstr "Crea fattura basata sul foglio ore"
+
+#~ msgid "Timesheets To Validate"
+#~ msgstr "Orari di Lavoro da convalidare"
+
+#~ msgid "Timesheet allowed difference"
+#~ msgstr "Differenza ammessa in Orari di Lavoro"
+
+#~ msgid "Creates your analytic cost accoording to quantity"
+#~ msgstr "Crea il tuo costo analitico in base alla quantità"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
+
+#~ msgid "Timesheet is validate by project manager."
+#~ msgstr "Il foglio ore è validato dal capo progetto"
+
+#~ msgid "Whatever time u spent for phone call"
+#~ msgstr "Tempo speso per chiamate telefoniche"
+
+#~ msgid "Validate Timesheet"
+#~ msgstr "Convalida il foglio ore"
+
+#~ msgid "My Department's Timesheet to Confirm"
+#~ msgstr "Foglio ore del mio Dipartimento da convalidare"
+
+#~ msgid "Create Analytic cost"
+#~ msgstr "Crea costo Analitico"
+
+#~ msgid "hr_timesheet_sheet.sheet"
+#~ msgstr "hr_timesheet_sheet.sheet"
+
+#~ msgid "At the end of the period (week/month)"
+#~ msgstr "Alla fine del periodo (settimana/mese)"
+
+#~ msgid "timesheet entry is into draft state."
+#~ msgstr "Il foglio ore è in stato di bozza"
+
+#~ msgid "Analytic cost is created"
+#~ msgstr "Il costo Analitico è creato"
+
+#~ msgid "Encode how much time u spent on phone call"
+#~ msgstr "Definisce quanto tempo hai speso in chiamate telefoniche"
+
+#~ msgid "Review of your work at the end of the day"
+#~ msgstr "Revisiona il tuo lavoro alla fine del giorno"
+
+#~ msgid "My timesheets"
+#~ msgstr "I Miei Orari di Lavoro"
+
+#~ msgid "Accept"
+#~ msgstr "Accetto"
+
+#~ msgid "Unvalidated Timesheets"
+#~ msgstr "Orari di Lavoro non Convalidati"
+
+#~ msgid "My Department's Timesheet to Validate"
+#~ msgstr "Foglio ore del mio Dipartimento da convalidare"
+
+#~ msgid "Control by the project manager"
+#~ msgstr "Controllato dall'Amministratore Progetto"
+
+#~ msgid "Defines the task work entry into timesheet line"
+#~ msgstr ""
+#~ "Definisce la voce di attività lavorate nelle righe del foglio di lavoro"
+
+#~ msgid "Hr Timesheet Process"
+#~ msgstr "HR Processe per Foglio orario"
+
+#~ msgid "Confirm timesheet sheet"
+#~ msgstr "Conferma il Foglio Presenza oraria"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome del modello non valido nella definizione dell'azione."
+
+#~ msgid "Encode your timesheet line"
+#~ msgstr "Codifica la tua linea del Foglio Orario"
+
+#~ msgid "Timesheet sheet confirm at the end of the period"
+#~ msgstr "Foglio Orario confermato alla fine del periodo"
+
+#~ msgid "Phone call encoding"
+#~ msgstr "Codifica chiamata telefonica"
+
+#~ msgid "Encode Your hours and Sign in / out"
+#~ msgstr "Codifica le tue ore e le registrazioni di Entrata / Uscita"
+
+#~ msgid "Defines employee's timesheet entry"
+#~ msgstr "Definisce le voci del Foglio Orario degli Impiegati"
+
+#~ msgid "Attendance entry moves into the timesheet"
+#~ msgstr "Voci di presenza spostate nel Foglio Ore"
+
+#~ msgid "Review end of day check day is complete"
+#~ msgstr "Verifica di fine giornata, il controllo giornata è completo"
diff --git a/addons/hr_timesheet_sheet/i18n/ko.po b/addons/hr_timesheet_sheet/i18n/ko.po
index 2cc42a66b0d..2e616b117b7 100644
--- a/addons/hr_timesheet_sheet/i18n/ko.po
+++ b/addons/hr_timesheet_sheet/i18n/ko.po
@@ -7,23 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-08 13:57+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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr "일일 업무마감 전 검토가 완료되었습니다."
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -40,27 +37,41 @@ msgid "Sheet"
 msgstr "시트"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr "귀하의 사용자로 정의된 직원이 없습니다."
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr "총 참석"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
-msgstr "확정할 내 일정"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
-msgstr "일정 범위"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -68,15 +79,35 @@ msgid "Today"
 msgstr "오늘"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
-msgstr "일정표 확정"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
+msgstr "시트의 총 차이가 %.2f 미만인지 확인하십시오!"
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr "일정"
 
@@ -86,20 +117,15 @@ msgid "Set to Draft"
 msgstr "초안으로 설정"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
-msgstr "직원의 일정 엔트리 정의"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "종료 날짜"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr "일정표 초안"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
-msgstr "내 현재 일정"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -107,7 +133,11 @@ msgid "Validate"
 msgstr "검증"
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr ""
 
@@ -116,6 +146,17 @@ msgstr ""
 msgid "Present"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr "사용자에러"
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -123,55 +164,57 @@ msgid "Refuse"
 msgstr "거부"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr "검증된 일정"
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr "일정표 날짜 범위 속에서 현재 날짜를 선택하십시오!"
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr "총 차이"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr "전화 통화 인코딩"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr "일일 일정"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr "일정 라인 안에서 과제 작업 엔트리를 정의하십시오."
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
-"Sign-In/Sign-Out 간의 허용된 차이와 한 시트를 위한 일정 계산. 어떤 통제도 원하지 않으면 0로 설정하십시오."
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
-msgstr "일일 일정"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
-msgstr "일정표는 주말/월말에 확정됩니다."
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
+msgstr "오늘 외 다른 날짜로 Sign-In할 수는 없습니다."
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr "경고!"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr "분석 계정"
 
@@ -180,30 +223,46 @@ msgstr "분석 계정"
 msgid "Project Timesheet"
 msgstr "프로젝트 일정"
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr "시작 날짜"
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
-msgstr "HR 일정 프로세스"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
-msgstr "분석 원가"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "일정"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr "확정됨"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr "참석"
 
@@ -219,29 +278,44 @@ msgid "Timesheet lines"
 msgstr "일정 라인"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
-msgstr "귀하의 일정 라인을 인코드"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
-msgstr "일정 확정"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
-msgstr "프로젝트 매니저에 의한 통제"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr "새로 만들기"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
-msgstr "기말에 일정을 확정"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
+msgstr "에러!"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
@@ -254,9 +328,20 @@ msgid "Timesheet Lines"
 msgstr "일정 라인"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
-msgstr "기말에 일정 확정"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -264,9 +349,21 @@ msgid "No employee defined"
 msgstr "정의된 직원가 없음"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
-msgstr "확정된 일정"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "유효하지 않은 액션!"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
@@ -274,13 +371,16 @@ msgid "Configuration"
 msgstr "구성"
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
-msgstr "주"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -289,10 +389,21 @@ msgid "Daily View"
 msgstr "일일 뷰"
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
-msgstr "기간별 일정"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr "총 일정"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -300,10 +411,15 @@ msgid "Sign In"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
-msgstr "내 부서의 일정"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -311,73 +427,123 @@ msgid "Go to:"
 msgstr "가기:"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
-msgstr "전화 통화"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
-msgstr "총 일정"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr "작업 검토"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
-msgstr "작업에 대한 인보이스"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr "월"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr "귀하의 시간과 Sign in / out를 인코드"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr "검토"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Draft"
 msgstr "초안"
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
-msgstr "일정"
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
-msgstr "확정할 일정"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr "오늘 이외의 날짜로 Sign-Out할 수는 없습니다."
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
-msgstr "상태"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
-msgstr "종료 날짜"
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr "주"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -385,14 +551,25 @@ msgid "Current Status"
 msgstr "현재 상태"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
-msgstr "일정에 대한 인보이스"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
+msgstr "확정된 일정 속의 엔트리를 수정할 수는 없습니다 !"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
-msgstr "일정에 기초한 인보이스"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr "사용자"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
@@ -400,30 +577,80 @@ msgid "Timesheet by Account"
 msgstr "계정별 일정"
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr "날짜"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
-msgstr "사용자"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
-msgstr "일정에 기초한 인보이스 생성"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
-msgstr "검증할 일정"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
-msgstr "허용된 일정 오차"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr "확정된 일정표 상의 엔트리를 수정할 수는 없습니다!"
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -431,25 +658,47 @@ msgstr "허용된 일정 오차"
 msgid "Period"
 msgstr "기간"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr "완료"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
-msgstr "일정 속으로 참석 엔트리 인동"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
-msgstr "수량에 따른 귀하의 분석 원가 생성"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
-msgstr "일정 라인"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -457,31 +706,59 @@ msgid "Timesheet by Accounts"
 msgstr "계정별 일정"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr "이미 확정된 표를 삭제할 수는 없습니다!"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
-msgstr "일정이 프로젝트 관리자에 의해 검증되었습니다."
+#: help:hr_timesheet_sheet.sheet,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
-msgstr "귀하의 총 통화 시간"
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
-msgstr "일정 검증"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
-msgstr "확정할 내 부서의 일정"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "일정 라인"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -491,25 +768,55 @@ msgid "Attendances"
 msgstr "참석"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
-msgstr "분석 원가 생성"
-
-#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,name:0
 #: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
 msgid "Description"
 msgstr "설명"
 
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr "일별"
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -517,30 +824,37 @@ msgstr "일별"
 msgid "Difference"
 msgstr "오차"
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr "부재"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
-msgstr "기간 말 (주/월)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
-msgstr "일정 엔트리가 초안 상태입니다."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
-msgstr "분석 원가가 생성됨."
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -548,14 +862,14 @@ msgid "Invoice rate"
 msgstr "인보이스 비율"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
-msgstr "귀하의 총 통화 시간을 인코드"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
+msgstr "작업에 대한 인보이스"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
-msgstr "일과 종료 후 일일 근무 검토"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -563,88 +877,227 @@ msgid "Analytic accounts"
 msgstr "분석 계정"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
-msgstr "내 일정"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
-msgstr "수락"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr "현재 날짜"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
-msgstr "검증되지 않은 일정"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr "년도"
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr "합계"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
-msgstr "검증할 내 부서의 일정"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr ""
 
-#, python-format
-#~ msgid "No employee defined for your user !"
-#~ msgstr "귀하의 사용자로 정의된 직원이 없습니다."
+#~ msgid "Review end of day check day is complete"
+#~ msgstr "일일 업무마감 전 검토가 완료되었습니다."
 
-#, python-format
-#~ msgid "UserError"
-#~ msgstr "사용자에러"
+#~ msgid "Total Difference"
+#~ msgstr "총 차이"
 
-#, python-format
-#~ msgid "You can not sign in from an other date than today"
-#~ msgstr "오늘 외 다른 날짜로 Sign-In할 수는 없습니다."
+#~ msgid "Phone call encoding"
+#~ msgstr "전화 통화 인코딩"
 
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "경고!"
+#~ msgid "Encode your timesheet line"
+#~ msgstr "귀하의 일정 라인을 인코드"
 
-#, python-format
-#~ msgid "Error !"
-#~ msgstr "에러!"
+#~ msgid "Analytic cost"
+#~ msgstr "분석 원가"
+
+#~ msgid "Hr Timesheet Process"
+#~ msgstr "HR 일정 프로세스"
+
+#~ msgid "Control by the project manager"
+#~ msgstr "프로젝트 매니저에 의한 통제"
+
+#~ msgid "Confirm Timesheet"
+#~ msgstr "일정 확정"
+
+#~ msgid "Confirm timesheet at the end of the period"
+#~ msgstr "기말에 일정 확정"
+
+#~ msgid "Timesheet sheet confirm at the end of the period"
+#~ msgstr "기말에 일정을 확정"
+
+#~ msgid "My Department's Timesheet"
+#~ msgstr "내 부서의 일정"
+
+#~ msgid "Timesheets by period"
+#~ msgstr "기간별 일정"
+
+#~ msgid "Confirmed Timesheet"
+#~ msgstr "확정된 일정"
+
+#~ msgid "Timesheet by Day"
+#~ msgstr "일일 일정"
+
+#~ msgid "Defines the task work entry into timesheet line"
+#~ msgstr "일정 라인 안에서 과제 작업 엔트리를 정의하십시오."
+
+#~ msgid "timesheet is confirmed at the end of the week / month"
+#~ msgstr "일정표는 주말/월말에 확정됩니다."
 
-#, python-format
 #~ msgid ""
-#~ "Please verify that the total difference of the sheet is lower than %.2f !"
-#~ msgstr "시트의 총 차이가 %.2f 미만인지 확인하십시오!"
+#~ "Allowed difference between the sign in/out and the timesheet computation for "
+#~ "one sheet. Set this to 0 if you do not want any control."
+#~ msgstr ""
+#~ "Sign-In/Sign-Out 간의 허용된 차이와 한 시트를 위한 일정 계산. 어떤 통제도 원하지 않으면 0로 설정하십시오."
 
-#, python-format
-#~ msgid "Invalid action !"
-#~ msgstr "유효하지 않은 액션!"
+#~ msgid "Timesheet by Days"
+#~ msgstr "일일 일정"
 
-#, python-format
-#~ msgid "You can not sign out from an other date than today"
-#~ msgstr "오늘 이외의 날짜로 Sign-Out할 수는 없습니다."
+#~ msgid "You must select a Current date wich is in the timesheet dates !"
+#~ msgstr "일정표 날짜 범위 속에서 현재 날짜를 선택하십시오!"
 
-#, python-format
-#~ msgid "You can not modify an entry in a confirmed timesheet !"
-#~ msgstr "확정된 일정표 상의 엔트리를 수정할 수는 없습니다!"
+#~ msgid "My timesheets to confirm"
+#~ msgstr "확정할 내 일정"
 
-#, python-format
-#~ msgid "You cannot modify an entry in a confirmed timesheet !"
-#~ msgstr "확정된 일정 속의 엔트리를 수정할 수는 없습니다 !"
+#~ msgid "Timeshet range"
+#~ msgstr "일정 범위"
 
-#, python-format
-#~ msgid "Cannot delete Sheet(s) which are already confirmed !"
-#~ msgstr "이미 확정된 표를 삭제할 수는 없습니다!"
+#~ msgid "Confirm timesheet sheet"
+#~ msgstr "일정표 확정"
+
+#~ msgid "Timesheets To Confirm"
+#~ msgstr "확정할 일정"
+
+#~ msgid "Phone call"
+#~ msgstr "전화 통화"
+
+#~ msgid "Review of work"
+#~ msgstr "작업 검토"
+
+#~ msgid "Encode Your hours and Sign in / out"
+#~ msgstr "귀하의 시간과 Sign in / out를 인코드"
+
+#~ msgid "Review"
+#~ msgstr "검토"
+
+#~ msgid "Status"
+#~ msgstr "상태"
+
+#~ msgid "Invoice on timesheet"
+#~ msgstr "일정에 대한 인보이스"
+
+#~ msgid "Invoice based on timesheet"
+#~ msgstr "일정에 기초한 인보이스"
+
+#~ msgid "Draft Timesheet sheet"
+#~ msgstr "일정표 초안"
+
+#~ msgid "My Current Timesheet"
+#~ msgstr "내 현재 일정"
+
+#~ msgid "Defines employee's timesheet entry"
+#~ msgstr "직원의 일정 엔트리 정의"
+
+#~ msgid "Validated Timesheet"
+#~ msgstr "검증된 일정"
+
+#~ msgid "Timesheets To Validate"
+#~ msgstr "검증할 일정"
+
+#~ msgid "Timesheet allowed difference"
+#~ msgstr "허용된 일정 오차"
+
+#~ msgid "Creates your analytic cost accoording to quantity"
+#~ msgstr "수량에 따른 귀하의 분석 원가 생성"
+
+#~ msgid "Attendance entry moves into the timesheet"
+#~ msgstr "일정 속으로 참석 엔트리 인동"
+
+#~ msgid "Creates invoice based on timesheet"
+#~ msgstr "일정에 기초한 인보이스 생성"
+
+#~ msgid "Timesheet is validate by project manager."
+#~ msgstr "일정이 프로젝트 관리자에 의해 검증되었습니다."
+
+#~ msgid "Create Analytic cost"
+#~ msgstr "분석 원가 생성"
+
+#~ msgid "My Department's Timesheet to Confirm"
+#~ msgstr "확정할 내 부서의 일정"
+
+#~ msgid "Validate Timesheet"
+#~ msgstr "일정 검증"
+
+#~ msgid "Whatever time u spent for phone call"
+#~ msgstr "귀하의 총 통화 시간"
+
+#~ msgid "At the end of the period (week/month)"
+#~ msgstr "기간 말 (주/월)"
 
 #, python-format
 #~ msgid "You can not duplicate a timesheet !"
 #~ msgstr "일정이 중첩되면 안됩니다!"
+
+#~ msgid "Encode how much time u spent on phone call"
+#~ msgstr "귀하의 총 통화 시간을 인코드"
+
+#~ msgid "timesheet entry is into draft state."
+#~ msgstr "일정 엔트리가 초안 상태입니다."
+
+#~ msgid "Analytic cost is created"
+#~ msgstr "분석 원가가 생성됨."
+
+#~ msgid "Unvalidated Timesheets"
+#~ msgstr "검증되지 않은 일정"
+
+#~ msgid "My Department's Timesheet to Validate"
+#~ msgstr "검증할 내 부서의 일정"
+
+#~ msgid "Accept"
+#~ msgstr "수락"
+
+#~ msgid "Review of your work at the end of the day"
+#~ msgstr "일과 종료 후 일일 근무 검토"
+
+#~ msgid "My timesheets"
+#~ msgstr "내 일정"
diff --git a/addons/hr_timesheet_sheet/i18n/lt.po b/addons/hr_timesheet_sheet/i18n/lt.po
index a7855ec3d74..41187014809 100644
--- a/addons/hr_timesheet_sheet/i18n/lt.po
+++ b/addons/hr_timesheet_sheet/i18n/lt.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-09 07:21+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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr ""
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -37,26 +34,40 @@ msgid "Sheet"
 msgstr "Lapas"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr "Bendras lankomumas"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
-msgstr "Mano darbo laiko žiniaraščiai laukiantys patvirtinimo"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -65,15 +76,35 @@ msgid "Today"
 msgstr "Šiandien"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr "Darbo laiko žiniaraštis"
 
@@ -83,28 +114,27 @@ msgid "Set to Draft"
 msgstr "Nustatyti kaip juodraštį"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
-msgstr ""
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "Data iki"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
-msgstr "Mano dabartinis darbo laiko žiniaraštis"
-
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
 msgid "Validate"
 msgstr "Patvirtinti"
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr "Diena"
 
@@ -113,6 +143,17 @@ msgstr "Diena"
 msgid "Present"
 msgstr "Yra darbo vietoje"
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -120,54 +161,57 @@ msgid "Refuse"
 msgstr "Atmesti"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr "Analitinė sąskaita"
 
@@ -176,30 +220,46 @@ msgstr "Analitinė sąskaita"
 msgid "Project Timesheet"
 msgstr "Projekto darbo laiko žiniaraštis"
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr "Data nuo"
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
-msgstr ""
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "Darbuotojo darbo laiko apskaitos žiniaraštis"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr "Patvirtinta"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr "Buvimas darbe"
 
@@ -215,28 +275,43 @@ msgid "Timesheet lines"
 msgstr "Darbo laiko žiniaraščio eilutės"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr "Naujas"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -250,8 +325,19 @@ msgid "Timesheet Lines"
 msgstr "Darbo laiko apskaitos žiniaraščio eilutės"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -260,8 +346,20 @@ msgid "No employee defined"
 msgstr "Nenurodytas darbuotojas"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -270,13 +368,16 @@ msgid "Configuration"
 msgstr "Nustatymai"
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
-msgstr "Savaitė"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -285,10 +386,21 @@ msgid "Daily View"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
-msgstr "Darbo laiko žiniaraštis pagal periodą"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr "Bendras darbo laiko apskaitos žiniaraštis"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -296,9 +408,14 @@ msgid "Sign In"
 msgstr "Užsiregistruoti"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -307,73 +424,123 @@ msgid "Go to:"
 msgstr "Eiti į:"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
-msgstr "Bendras darbo laiko apskaitos žiniaraštis"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr "Mėnuo"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Draft"
 msgstr "Juodraštis"
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
-msgstr "Darbuotojo darbo laiko apskaitos žiniaraštis"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
-msgstr "Būsena"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
-msgstr "Data iki"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr "Savaitė"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -381,45 +548,106 @@ msgid "Current Status"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr "Naudotojas"
+
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
 msgid "Timesheet by Account"
 msgstr "Darbo laiko žiniaraštis pagal sąskaitą"
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr "Data"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
-msgstr "Naudotojas"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
-msgstr "Leidžiamas skirtumas tarp darbo laiko žiniaraščių"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -427,25 +655,47 @@ msgstr "Leidžiamas skirtumas tarp darbo laiko žiniaraščių"
 msgid "Period"
 msgstr "Periodas"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr "Atlikta"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
-msgstr "Darbo laiko žiniaraščio eilutė"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -453,30 +703,58 @@ msgid "Timesheet by Accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Darbo laiko žiniaraščio eilutė"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -487,25 +765,55 @@ msgid "Attendances"
 msgstr "Lankomumas"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
+msgstr "Aprašas"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,name:0
-msgid "Description"
-msgstr "Aprašas"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign Out"
 msgstr "Išsiregistruoti"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -513,29 +821,36 @@ msgstr ""
 msgid "Difference"
 msgstr "Skirtumas"
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr "Nėra darbo vietoje"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -544,13 +859,13 @@ msgid "Invoice rate"
 msgstr "Sąskaitos faktūros koeficientas"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -559,39 +874,85 @@ msgid "Analytic accounts"
 msgstr "Analitinės sąskaitos"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
-msgstr "Mano darbo laiko apskaitos žiniaraštis"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
-msgstr "Priimti"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr "Dabartinė data"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
-msgstr "Nepatvirtinti darbo laiko žiniaraščiai"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr "Metai"
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr "Iš viso"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
+
+#~ msgid "My timesheets to confirm"
+#~ msgstr "Mano darbo laiko žiniaraščiai laukiantys patvirtinimo"
+
+#~ msgid "My Current Timesheet"
+#~ msgstr "Mano dabartinis darbo laiko žiniaraštis"
+
+#~ msgid "Timesheets by period"
+#~ msgstr "Darbo laiko žiniaraštis pagal periodą"
+
+#~ msgid "Status"
+#~ msgstr "Būsena"
+
+#~ msgid "Timesheet allowed difference"
+#~ msgstr "Leidžiamas skirtumas tarp darbo laiko žiniaraščių"
+
+#~ msgid "My timesheets"
+#~ msgstr "Mano darbo laiko apskaitos žiniaraštis"
+
+#~ msgid "Accept"
+#~ msgstr "Priimti"
+
+#~ msgid "Unvalidated Timesheets"
+#~ msgstr "Nepatvirtinti darbo laiko žiniaraščiai"
diff --git a/addons/hr_timesheet_sheet/i18n/lv.po b/addons/hr_timesheet_sheet/i18n/lv.po
index e330cabce5c..3c8899f7f8b 100644
--- a/addons/hr_timesheet_sheet/i18n/lv.po
+++ b/addons/hr_timesheet_sheet/i18n/lv.po
@@ -7,23 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-10-22 14:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@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:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr ""
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -38,26 +35,40 @@ msgid "Sheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -66,15 +77,35 @@ msgid "Today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr ""
 
@@ -84,19 +115,14 @@ msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -105,7 +131,11 @@ msgid "Validate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr ""
 
@@ -114,6 +144,17 @@ msgstr ""
 msgid "Present"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -121,54 +162,57 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
@@ -177,30 +221,46 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr ""
 
@@ -216,28 +276,43 @@ msgid "Timesheet lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -251,8 +326,19 @@ msgid "Timesheet Lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -261,8 +347,20 @@ msgid "No employee defined"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -271,13 +369,16 @@ msgid "Configuration"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -286,9 +387,20 @@ msgid "Daily View"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -297,9 +409,14 @@ msgid "Sign In"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -308,72 +425,122 @@ msgid "Go to:"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: selection:hr_timesheet_sheet.sheet,state:0
-msgid "Draft"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
+msgid "In Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -382,13 +549,24 @@ msgid "Current Status"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -397,29 +575,79 @@ msgid "Timesheet by Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -428,24 +656,46 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -454,30 +704,58 @@ msgid "Timesheet by Accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -488,13 +766,26 @@ msgid "Attendances"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,name:0
-msgid "Description"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -502,11 +793,28 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -514,29 +822,36 @@ msgstr ""
 msgid "Difference"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -545,13 +860,13 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -560,39 +875,61 @@ msgid "Analytic accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
diff --git a/addons/hr_timesheet_sheet/i18n/mn.po b/addons/hr_timesheet_sheet/i18n/mn.po
index dc18fbcabc7..84cd9f63714 100644
--- a/addons/hr_timesheet_sheet/i18n/mn.po
+++ b/addons/hr_timesheet_sheet/i18n/mn.po
@@ -20,14 +20,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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-25 19:32+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-26 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
@@ -67,11 +67,6 @@ msgstr "Энэ хэрэглэгчид харгалзах ажилтны тодо
 msgid "Group By..."
 msgstr "Бүлэглэх..."
 
-#. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Дэлгэцийн үйлдлийг тодорхойлохдоо моделийн нэрийг буруу бичжээ"
-
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
@@ -304,8 +299,8 @@ msgid "Timesheet lines"
 msgstr "Цаг бүртгэлийн мөрүүд"
 
 #. module: hr_timesheet_sheet
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -331,11 +326,6 @@ msgstr "Ажилтан"
 msgid "New"
 msgstr "Шинэ"
 
-#. module: hr_timesheet_sheet
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
 msgid "My Total Attendances By Week"
@@ -369,6 +359,11 @@ msgstr "Хугацаа"
 msgid "#Cost"
 msgstr "#Үнэ"
 
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "No employee defined"
@@ -405,11 +400,6 @@ msgid ""
 msgstr ""
 "Хэрэглэгч нь тодорхойлогдоогүй ажилтны цаг бүртгэлийг үүсгэж болохгүй !"
 
-#. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Дэлгэцийн архитектур алдаатай!"
-
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
 msgid "Work on Task"
@@ -540,11 +530,6 @@ msgstr "Ноорог"
 msgid "Timesheet allowed difference(Hours)"
 msgstr "Цаг бүртгэлийн зөвшөөрсөн зөрүү(цагаар)"
 
-#. module: hr_timesheet_sheet
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй."
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #, python-format
@@ -684,12 +669,6 @@ msgstr "Тоо хэмжээ"
 msgid "General Account"
 msgstr "Ерөнхий данс"
 
-#. module: hr_timesheet_sheet
-#: view:timesheet.report:0
-#: field:timesheet.report,to_invoice:0
-msgid "Type of Invoicing"
-msgstr "Нэхэмжлэлийн төрөл"
-
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
 msgid ""
@@ -732,11 +711,6 @@ msgstr "Дууссан"
 msgid "State is 'draft'."
 msgstr "Төлөв нь 'ноорог'."
 
-#. module: hr_timesheet_sheet
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Cancel"
@@ -752,24 +726,11 @@ msgstr "Батлах"
 msgid "Open"
 msgstr "Нээлттэй"
 
-#. module: hr_timesheet_sheet
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Timesheet by Accounts"
 msgstr "Цаг бүртгэлийг дансаар харах"
 
-#. module: hr_timesheet_sheet
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-"болохгүй!"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #, python-format
@@ -946,9 +907,10 @@ msgid "Analytic accounts"
 msgstr "Аналитик данс"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "osv_memory обьект дүрмийг дэмждэггүй"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr "Нэхэмжлэлийн төрөл"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
@@ -1019,6 +981,9 @@ msgstr "Журнал"
 #~ msgid "Review end of day check day is complete"
 #~ msgstr "Өдөр дууссан эсэхийг орой авч үзэх"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Дэлгэцийн үйлдлийг тодорхойлохдоо моделийн нэрийг буруу бичжээ"
+
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Цаг бүртгэлийн ноорог хүснэгт"
 
@@ -1163,3 +1128,18 @@ msgstr "Журнал"
 
 #~ msgid "My timesheets"
 #~ msgstr "Өөрийн цаг бүртгэл"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Дэлгэцийн архитектур алдаатай!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+#~ "болохгүй!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй."
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "osv_memory обьект дүрмийг дэмждэггүй"
diff --git a/addons/hr_timesheet_sheet/i18n/nl.po b/addons/hr_timesheet_sheet/i18n/nl.po
index 3d1b41b9750..fd1d350c68f 100644
--- a/addons/hr_timesheet_sheet/i18n/nl.po
+++ b/addons/hr_timesheet_sheet/i18n/nl.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-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/nl_BE.po b/addons/hr_timesheet_sheet/i18n/nl_BE.po
index 4b17ef96fad..50fc705fb5b 100644
--- a/addons/hr_timesheet_sheet/i18n/nl_BE.po
+++ b/addons/hr_timesheet_sheet/i18n/nl_BE.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-04-10 10:09+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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr ""
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -37,26 +34,40 @@ msgid "Sheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -65,15 +76,35 @@ msgid "Today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr ""
 
@@ -83,19 +114,14 @@ msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -104,7 +130,11 @@ msgid "Validate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr ""
 
@@ -113,6 +143,17 @@ msgstr ""
 msgid "Present"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -120,54 +161,57 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
@@ -176,30 +220,46 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr ""
 
@@ -215,28 +275,43 @@ msgid "Timesheet lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -250,8 +325,19 @@ msgid "Timesheet Lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -260,8 +346,20 @@ msgid "No employee defined"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -270,13 +368,16 @@ msgid "Configuration"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -285,9 +386,20 @@ msgid "Daily View"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -296,9 +408,14 @@ msgid "Sign In"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -307,72 +424,122 @@ msgid "Go to:"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: selection:hr_timesheet_sheet.sheet,state:0
-msgid "Draft"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
+msgid "In Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -381,13 +548,24 @@ msgid "Current Status"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -396,29 +574,79 @@ msgid "Timesheet by Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -427,24 +655,46 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -453,31 +703,58 @@ msgid "Timesheet by Accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state: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 karakters bevatten !"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -488,13 +765,26 @@ msgid "Attendances"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,name:0
-msgid "Description"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -502,11 +792,28 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -514,29 +821,36 @@ msgstr ""
 msgid "Difference"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -545,13 +859,13 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -560,39 +874,66 @@ msgid "Analytic accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
+
+#~ 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 karakters bevatten !"
diff --git a/addons/hr_timesheet_sheet/i18n/pl.po b/addons/hr_timesheet_sheet/i18n/pl.po
index e32a91fa299..61cf9daea73 100644
--- a/addons/hr_timesheet_sheet/i18n/pl.po
+++ b/addons/hr_timesheet_sheet/i18n/pl.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 06:28+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr "Przejżyj kompletność dnia na koniec"
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -39,27 +36,41 @@ msgid "Sheet"
 msgstr "Karta"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr "Suma obecności"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
-msgstr "Moje karty czasu pracy do zatwierdzenia"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
-msgstr "Zakres karty czasu pracy"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -67,15 +78,35 @@ msgid "Today"
 msgstr "Dziś"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
-msgstr "Potwierdź kartę czasu pracy"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr "Karta czasu pracy"
 
@@ -85,20 +116,15 @@ msgid "Set to Draft"
 msgstr "Ustaw na projekt"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
-msgstr "Definiuje wpisy do kart pracowników"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "Data do"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr "Projekt zestawień kart czasu pracy"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
-msgstr "Moja bieżąca karta czasu pracy"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -106,7 +132,11 @@ msgid "Validate"
 msgstr "Zatwierdź"
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr "Dzień"
 
@@ -115,6 +145,17 @@ msgstr "Dzień"
 msgid "Present"
 msgstr "Obecny(a)"
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -122,56 +163,57 @@ msgid "Refuse"
 msgstr "Odmów"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr "Zatwierdzona karta czasu pracy"
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr "Musisz wybrac datę bieżącą, która jest w karcie czasu pracy !"
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr "Suma różnic"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr "Rejestrowanie telefonów"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr "Karta czasu pracy wg dni"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr "Definiuje pracę zadania do pozycji karty czasu pracy"
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
-"Dozwolone różnice między wejściami/wyśjciami a wyliczeniami karty czasu "
-"pracy dla jednej karty. Ustaw 0, jeśli nie chcesz żadnej kontroli."
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
-msgstr "Karta czasu pracy wg dni"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
-msgstr "karta czasu pracy jest zatwierdzana na koniec tygodnia / miesiąca"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr "Konto analityczne"
 
@@ -180,30 +222,46 @@ msgstr "Konto analityczne"
 msgid "Project Timesheet"
 msgstr "Karta czasu pracy projektu"
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr "Data od"
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
-msgstr "Proces karty czasu pracy Zas. kadr."
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
-msgstr "Koszt analityczny"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "Karty czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr "Potwierdzone"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr "Obecności"
 
@@ -219,29 +277,44 @@ msgid "Timesheet lines"
 msgstr "Pozycje karty czasu pracy"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
-msgstr "Wprowadź twoją pozycje karty czasu pracy"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
-msgstr "Zatwierdź kartę czasu pracy"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
-msgstr "Sprawdzane przez menedżera projektu"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr "Nowa"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
-msgstr "Zestawienie kart czasu pracy zatwierdzane na koniec okresu"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
@@ -254,9 +327,20 @@ msgid "Timesheet Lines"
 msgstr "Pozycje karty czasu pracy"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
-msgstr "Zatwierdź kartę czasu pracy na koniec okresu"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -264,9 +348,21 @@ msgid "No employee defined"
 msgstr "Nie zdefiniowano pracownika"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
-msgstr "Karta czasu pracy zatwierdzona"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
@@ -274,14 +370,17 @@ msgid "Configuration"
 msgstr "Konfiguracja"
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
-msgstr "Tydzień"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -289,10 +388,21 @@ msgid "Daily View"
 msgstr "Widok dniowy"
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
-msgstr "Karty czasu pracy wg okresu"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr "Suma karty czasu pracy"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -300,10 +410,15 @@ msgid "Sign In"
 msgstr "Wejście"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
-msgstr "Karta czasu pracy mojego działu"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -311,73 +426,123 @@ msgid "Go to:"
 msgstr "Idź do:"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
-msgstr "Rozmowa telefoniczna"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
-msgstr "Suma karty czasu pracy"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr "Przegląd pracy"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
-msgstr "Faktura za pracę"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr "Miesiąc"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr "Wprowadź swoje godziny oraz wejścia / wyjścia"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr "Przegląd"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Draft"
 msgstr "Projekt"
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
-msgstr "Karty czasu pracy"
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
-msgstr "Karty czasu pracy do zatwierdzenia"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
-msgstr "Stan"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
-msgstr "Data do"
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr "Tydzień"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -385,14 +550,25 @@ msgid "Current Status"
 msgstr "Bieżący stan"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
-msgstr "Faktura z karty czasu pracy"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
-msgstr "Faktura oparta o kartę czasu pracy"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr "Użytkownik"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
@@ -400,30 +576,80 @@ msgid "Timesheet by Account"
 msgstr "Karta czasu pracy wg kont"
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr "Data"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
-msgstr "Użytkownik"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
-msgstr "Tworzy fakturę w oparciu o kartę czasu pracy"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
-msgstr "Karty do zatwierdzenia"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
-msgstr "Dozowolone różnice  w karcie czasu pracy"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -431,25 +657,47 @@ msgstr "Dozowolone różnice  w karcie czasu pracy"
 msgid "Period"
 msgstr "Okres"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr "Wykonano"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
-msgstr "Przenoszenie zapisów obecności do karty czasu pracy"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
-msgstr "Tworzy twoje koszty analityczne według ilości"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
-msgstr "Pozycja karty czasu pracy"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -457,33 +705,59 @@ msgid "Timesheet by Accounts"
 msgstr "Karta czasu pracy wg kont"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
 msgstr ""
-"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-"specjalnych !"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
-msgstr "Karta czasu pracy została zatwierdzona przez menedżera."
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
-msgstr "Czas spędzony na rozmowach telefonicznych"
+#: help:hr_timesheet_sheet.sheet,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
-msgstr "Zatwierdź kartę czasu pracy"
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
-msgstr "Karta czasu pracy mojego działu do zatwierdzenia"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Pozycja karty czasu pracy"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -493,25 +767,55 @@ msgid "Attendances"
 msgstr "Obecności"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
-msgstr "Utwórz koszt analityczny"
-
-#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,name:0
 #: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
 msgid "Description"
 msgstr "Opis"
 
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign Out"
 msgstr "Wyjście"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr "Wg dni"
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -519,30 +823,37 @@ msgstr "Wg dni"
 msgid "Difference"
 msgstr "Różnica"
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr "Nieobecny(a)"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
-msgstr "Na koniec okresu (tygodnia/miesiąca)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
-msgstr "zapis karty czasu pracy jest w stanie projekt."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
-msgstr "Utworzono koszt analityczny"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -550,14 +861,14 @@ msgid "Invoice rate"
 msgstr "Współczynnik fakturowania"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
-msgstr "Wprowadź ile czasu spędziłaś(eś) na rozmowach telefonicznych"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
+msgstr "Faktura za pracę"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
-msgstr "Przejrzyj swoją pracę na koniec dnia"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -565,39 +876,236 @@ msgid "Analytic accounts"
 msgstr "Konta analityczne"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
-msgstr "Moje karty czasu pracy"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
-msgstr "Akceptuj"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr "Bieżąca data"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
-msgstr "Odtwierdzone karty"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr "Rok"
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr "Suma"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
-msgstr "Karty czasu pracy mojego działu do zatwierdzenia"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#~ 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 "Timeshet range"
+#~ msgstr "Zakres karty czasu pracy"
+
+#~ msgid "My timesheets to confirm"
+#~ msgstr "Moje karty czasu pracy do zatwierdzenia"
+
+#~ msgid "Draft Timesheet sheet"
+#~ msgstr "Projekt zestawień kart czasu pracy"
+
+#~ msgid "My Current Timesheet"
+#~ msgstr "Moja bieżąca karta czasu pracy"
+
+#~ msgid "Timesheet by Day"
+#~ msgstr "Karta czasu pracy wg dni"
+
+#~ msgid "Defines the task work entry into timesheet line"
+#~ msgstr "Definiuje pracę zadania do pozycji karty czasu pracy"
+
+#~ msgid "Total Difference"
+#~ msgstr "Suma różnic"
+
+#~ msgid "timesheet is confirmed at the end of the week / month"
+#~ msgstr "karta czasu pracy jest zatwierdzana na koniec tygodnia / miesiąca"
+
+#~ msgid "Timesheet by Days"
+#~ msgstr "Karta czasu pracy wg dni"
+
+#~ msgid "Analytic cost"
+#~ msgstr "Koszt analityczny"
+
+#~ msgid "Control by the project manager"
+#~ msgstr "Sprawdzane przez menedżera projektu"
+
+#~ msgid "Confirm Timesheet"
+#~ msgstr "Zatwierdź kartę czasu pracy"
+
+#~ msgid "Confirm timesheet at the end of the period"
+#~ msgstr "Zatwierdź kartę czasu pracy na koniec okresu"
+
+#~ msgid "Timesheet sheet confirm at the end of the period"
+#~ msgstr "Zestawienie kart czasu pracy zatwierdzane na koniec okresu"
+
+#~ msgid "Timesheets by period"
+#~ msgstr "Karty czasu pracy wg okresu"
+
+#~ msgid "My Department's Timesheet"
+#~ msgstr "Karta czasu pracy mojego działu"
+
+#~ msgid "Confirmed Timesheet"
+#~ msgstr "Karta czasu pracy zatwierdzona"
+
+#~ msgid "Timesheets To Confirm"
+#~ msgstr "Karty czasu pracy do zatwierdzenia"
+
+#~ msgid "Phone call"
+#~ msgstr "Rozmowa telefoniczna"
+
+#~ msgid "Review of work"
+#~ msgstr "Przegląd pracy"
+
+#~ msgid "Review"
+#~ msgstr "Przegląd"
+
+#~ msgid "Invoice on timesheet"
+#~ msgstr "Faktura z karty czasu pracy"
+
+#~ msgid "Status"
+#~ msgstr "Stan"
+
+#~ msgid "Invoice based on timesheet"
+#~ msgstr "Faktura oparta o kartę czasu pracy"
+
+#~ msgid "Timesheet allowed difference"
+#~ msgstr "Dozowolone różnice  w karcie czasu pracy"
+
+#~ msgid "Creates your analytic cost accoording to quantity"
+#~ msgstr "Tworzy twoje koszty analityczne według ilości"
+
+#~ msgid "Attendance entry moves into the timesheet"
+#~ msgstr "Przenoszenie zapisów obecności do karty czasu pracy"
+
+#~ msgid "Creates invoice based on timesheet"
+#~ msgstr "Tworzy fakturę w oparciu o kartę czasu pracy"
+
+#~ msgid "Create Analytic cost"
+#~ msgstr "Utwórz koszt analityczny"
+
+#~ msgid "My Department's Timesheet to Confirm"
+#~ msgstr "Karta czasu pracy mojego działu do zatwierdzenia"
+
+#~ msgid "Whatever time u spent for phone call"
+#~ msgstr "Czas spędzony na rozmowach telefonicznych"
+
+#~ msgid "At the end of the period (week/month)"
+#~ msgstr "Na koniec okresu (tygodnia/miesiąca)"
+
+#~ msgid "timesheet entry is into draft state."
+#~ msgstr "zapis karty czasu pracy jest w stanie projekt."
+
+#~ msgid "Analytic cost is created"
+#~ msgstr "Utworzono koszt analityczny"
+
+#~ msgid "Encode how much time u spent on phone call"
+#~ msgstr "Wprowadź ile czasu spędziłaś(eś) na rozmowach telefonicznych"
+
+#~ msgid "Accept"
+#~ msgstr "Akceptuj"
+
+#~ msgid "Review of your work at the end of the day"
+#~ msgstr "Przejrzyj swoją pracę na koniec dnia"
+
+#~ msgid "My timesheets"
+#~ msgstr "Moje karty czasu pracy"
+
+#~ msgid "Confirm timesheet sheet"
+#~ msgstr "Potwierdź kartę czasu pracy"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
+#~ msgid "You must select a Current date wich is in the timesheet dates !"
+#~ msgstr "Musisz wybrac datę bieżącą, która jest w karcie czasu pracy !"
+
+#~ msgid "Validated Timesheet"
+#~ msgstr "Zatwierdzona karta czasu pracy"
+
+#~ msgid "Timesheet is validate by project manager."
+#~ msgstr "Karta czasu pracy została zatwierdzona przez menedżera."
+
+#~ msgid "Validate Timesheet"
+#~ msgstr "Zatwierdź kartę czasu pracy"
+
+#~ msgid "My Department's Timesheet to Validate"
+#~ msgstr "Karty czasu pracy mojego działu do zatwierdzenia"
+
+#~ msgid "Review end of day check day is complete"
+#~ msgstr "Przejżyj kompletność dnia na koniec"
+
+#~ msgid "Defines employee's timesheet entry"
+#~ msgstr "Definiuje wpisy do kart pracowników"
+
+#~ msgid "Phone call encoding"
+#~ msgstr "Rejestrowanie telefonów"
+
+#~ msgid "Encode your timesheet line"
+#~ msgstr "Wprowadź twoją pozycje karty czasu pracy"
+
+#~ msgid "Hr Timesheet Process"
+#~ msgstr "Proces karty czasu pracy Zas. kadr."
+
+#~ msgid "Encode Your hours and Sign in / out"
+#~ msgstr "Wprowadź swoje godziny oraz wejścia / wyjścia"
+
+#~ msgid "Timesheets To Validate"
+#~ msgstr "Karty do zatwierdzenia"
+
+#~ msgid "Unvalidated Timesheets"
+#~ msgstr "Odtwierdzone karty"
+
+#~ msgid ""
+#~ "Allowed difference between the sign in/out and the timesheet computation for "
+#~ "one sheet. Set this to 0 if you do not want any control."
+#~ msgstr ""
+#~ "Dozwolone różnice między wejściami/wyśjciami a wyliczeniami karty czasu "
+#~ "pracy dla jednej karty. Ustaw 0, jeśli nie chcesz żadnej kontroli."
diff --git a/addons/hr_timesheet_sheet/i18n/pt.po b/addons/hr_timesheet_sheet/i18n/pt.po
index 8e3677ad384..1faa8f5ea44 100644
--- a/addons/hr_timesheet_sheet/i18n/pt.po
+++ b/addons/hr_timesheet_sheet/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-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/pt_BR.po b/addons/hr_timesheet_sheet/i18n/pt_BR.po
index 08aff34d760..f989ba5212e 100644
--- a/addons/hr_timesheet_sheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet_sheet/i18n/pt_BR.po
@@ -7,23 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-17 06:59+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: <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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr ""
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -38,26 +35,40 @@ msgid "Sheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -66,15 +77,35 @@ msgid "Today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr ""
 
@@ -84,19 +115,14 @@ msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -105,7 +131,11 @@ msgid "Validate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr ""
 
@@ -114,6 +144,17 @@ msgstr ""
 msgid "Present"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -121,54 +162,57 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
@@ -177,30 +221,46 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr ""
 
@@ -216,28 +276,43 @@ msgid "Timesheet lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -251,8 +326,19 @@ msgid "Timesheet Lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -261,8 +347,20 @@ msgid "No employee defined"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -271,14 +369,17 @@ msgid "Configuration"
 msgstr "Configuração"
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -286,9 +387,20 @@ msgid "Daily View"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -297,9 +409,14 @@ msgid "Sign In"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -308,72 +425,122 @@ msgid "Go to:"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: selection:hr_timesheet_sheet.sheet,state:0
-msgid "Draft"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
+msgid "In Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -382,13 +549,24 @@ msgid "Current Status"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -397,29 +575,79 @@ msgid "Timesheet by Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -428,24 +656,46 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -454,32 +704,58 @@ msgid "Timesheet by Accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-"especial!"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -490,13 +766,26 @@ msgid "Attendances"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,name:0
-msgid "Description"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -504,11 +793,28 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -516,29 +822,36 @@ msgstr ""
 msgid "Difference"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr "hr_timesheet_sheet.sheet"
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -547,13 +860,13 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -562,39 +875,73 @@ msgid "Analytic accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalido XML para Arquitetura da View"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
+#~ "especial!"
+
+#~ msgid "hr_timesheet_sheet.sheet"
+#~ msgstr "hr_timesheet_sheet.sheet"
diff --git a/addons/hr_timesheet_sheet/i18n/ro.po b/addons/hr_timesheet_sheet/i18n/ro.po
index 153951ab0dc..3754d4064e9 100644
--- a/addons/hr_timesheet_sheet/i18n/ro.po
+++ b/addons/hr_timesheet_sheet/i18n/ro.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr ""
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -37,26 +34,40 @@ msgid "Sheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -65,15 +76,35 @@ msgid "Today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr ""
 
@@ -83,19 +114,14 @@ msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -104,7 +130,11 @@ msgid "Validate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr ""
 
@@ -113,6 +143,17 @@ msgstr ""
 msgid "Present"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -120,54 +161,57 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
@@ -176,30 +220,46 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr ""
 
@@ -215,28 +275,43 @@ msgid "Timesheet lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -250,8 +325,19 @@ msgid "Timesheet Lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -260,8 +346,20 @@ msgid "No employee defined"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -270,13 +368,16 @@ msgid "Configuration"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -285,9 +386,20 @@ msgid "Daily View"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -296,9 +408,14 @@ msgid "Sign In"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -307,72 +424,122 @@ msgid "Go to:"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: selection:hr_timesheet_sheet.sheet,state:0
-msgid "Draft"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
+msgid "In Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -381,13 +548,24 @@ msgid "Current Status"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -396,29 +574,79 @@ msgid "Timesheet by Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -427,24 +655,46 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -453,30 +703,58 @@ msgid "Timesheet by Accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -487,13 +765,26 @@ msgid "Attendances"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,name:0
-msgid "Description"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -501,11 +792,28 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -513,29 +821,36 @@ msgstr ""
 msgid "Difference"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -544,13 +859,13 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -559,39 +874,61 @@ msgid "Analytic accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
diff --git a/addons/hr_timesheet_sheet/i18n/ru.po b/addons/hr_timesheet_sheet/i18n/ru.po
index 8e9bf656df6..bf682bf30cc 100644
--- a/addons/hr_timesheet_sheet/i18n/ru.po
+++ b/addons/hr_timesheet_sheet/i18n/ru.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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-29 07:46+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-11-30 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
@@ -51,11 +51,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
@@ -280,9 +275,9 @@ msgid "Timesheet lines"
 msgstr "Строки табеля"
 
 #. module: hr_timesheet_sheet
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Название модуля должно быть уникальным !"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0
@@ -307,11 +302,6 @@ msgstr "Сотрудник"
 msgid "New"
 msgstr "Новый"
 
-#. module: hr_timesheet_sheet
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
 msgid "My Total Attendances By Week"
@@ -345,6 +335,11 @@ msgstr "Часы"
 msgid "#Cost"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "No employee defined"
@@ -380,11 +375,6 @@ msgid ""
 "defined !"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
-
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
 msgid "Work on Task"
@@ -513,11 +503,6 @@ msgstr "Черновик"
 msgid "Timesheet allowed difference(Hours)"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #, python-format
@@ -657,12 +642,6 @@ msgstr ""
 msgid "General Account"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: view:timesheet.report:0
-#: field:timesheet.report,to_invoice:0
-msgid "Type of Invoicing"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
 msgid ""
@@ -703,11 +682,6 @@ msgstr "Выполнено"
 msgid "State is 'draft'."
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Cancel"
@@ -723,24 +697,11 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Timesheet by Accounts"
 msgstr "Табели по счетам"
 
-#. module: hr_timesheet_sheet
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #, python-format
@@ -913,8 +874,9 @@ msgid "Analytic accounts"
 msgstr "Счета аналитики"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -996,6 +958,9 @@ msgstr ""
 #~ msgid "Timesheet by Days"
 #~ msgstr "Табели по дням"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра архитектуры!"
+
 #~ msgid "Timesheets by period"
 #~ msgstr "Табели по периоду"
 
@@ -1011,6 +976,12 @@ msgstr ""
 #~ msgid "Timesheet allowed difference"
 #~ msgstr "Допустимое расхождение для табеля"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
+
 #~ msgid "My timesheets"
 #~ msgstr "Мои табели"
 
@@ -1020,8 +991,20 @@ msgstr ""
 #~ msgid "Unvalidated Timesheets"
 #~ msgstr "Непроверенные табели"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Недопустимое имя модели в определении действия."
+
 #~ msgid "Phone call"
 #~ msgstr "Телефонный звонок"
 
 #~ msgid "Review"
 #~ msgstr "Обзор"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Название модуля должно быть уникальным !"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
diff --git a/addons/hr_timesheet_sheet/i18n/sl.po b/addons/hr_timesheet_sheet/i18n/sl.po
index 29348df823d..13bfa17de8d 100644
--- a/addons/hr_timesheet_sheet/i18n/sl.po
+++ b/addons/hr_timesheet_sheet/i18n/sl.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 06:31+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr ""
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -37,26 +34,40 @@ msgid "Sheet"
 msgstr "List"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Napačno ime modela v definiciji dejanja."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -65,15 +76,35 @@ msgid "Today"
 msgstr "Danes"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr "Časovnica"
 
@@ -83,19 +114,14 @@ msgid "Set to Draft"
 msgstr "Preklopi v pripravo"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
-msgstr ""
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "Datum do"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -104,7 +130,11 @@ msgid "Validate"
 msgstr "Preveri"
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr "Dan"
 
@@ -113,6 +143,17 @@ msgstr "Dan"
 msgid "Present"
 msgstr "Prisoten"
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr "NapakaUporabnika"
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -120,54 +161,57 @@ msgid "Refuse"
 msgstr "Zavrni"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr "Preveri časovnico"
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr "Skupna razlika"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Opozorilo!"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr "Analitični konto"
 
@@ -176,30 +220,46 @@ msgstr "Analitični konto"
 msgid "Project Timesheet"
 msgstr "Časovnica projekta"
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
-msgstr ""
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "Časovnice"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr "Potrjeno"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr "Prisotnost"
 
@@ -215,30 +275,45 @@ msgid "Timesheet lines"
 msgstr "Postavke časovnice"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
-msgstr "Potrdi časovnico"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr "Novo"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
+msgstr "Napaka!"
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
 msgid "Total Time"
@@ -250,8 +325,19 @@ msgid "Timesheet Lines"
 msgstr "Postavke časovnice"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -260,8 +346,20 @@ msgid "No employee defined"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Nepravilno dejanje!"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -270,14 +368,17 @@ msgid "Configuration"
 msgstr "Konfiguracija"
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
-msgstr "Teden"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -285,10 +386,21 @@ msgid "Daily View"
 msgstr "Dnevni pogled"
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
-msgstr "Časovnice po obdobjuh"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -296,9 +408,14 @@ msgid "Sign In"
 msgstr "Prijava:"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -307,73 +424,123 @@ msgid "Go to:"
 msgstr "Pojdi na:"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
-msgstr "Telefonski klic"
-
-#. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr "Mesec"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr "Pregled"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Draft"
 msgstr "Osnutek"
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
-msgstr "Časovnice"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
-msgstr "Stanje"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
-msgstr "Datum do"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr "Teden"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -381,44 +548,105 @@ msgid "Current Status"
 msgstr "Trenutno stanje"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr "Uporabnik"
+
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
 msgid "Timesheet by Account"
 msgstr "Časovnice po kontih"
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr "Datum"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
-msgstr "Uporabnik"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -427,25 +655,47 @@ msgstr ""
 msgid "Period"
 msgstr "Obdobje"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr "Zaključeno"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
-msgstr "Postavka časovnice"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -453,31 +703,58 @@ msgid "Timesheet by Accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Postavka časovnice"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -488,25 +765,55 @@ msgid "Attendances"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,name:0
-msgid "Description"
-msgstr "Opis"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign Out"
 msgstr "Odjavi"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -514,29 +821,36 @@ msgstr ""
 msgid "Difference"
 msgstr "Razlika"
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr "Odsoten"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -545,13 +859,13 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -560,39 +874,96 @@ msgid "Analytic accounts"
 msgstr "Analitični konti"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
-msgstr "Sprejmi"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr "Trenutni datum"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr "Leto"
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr "Skupaj"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
+
+#~ msgid "Validated Timesheet"
+#~ msgstr "Preveri časovnico"
+
+#~ msgid "Phone call"
+#~ msgstr "Telefonski klic"
+
+#~ msgid "Review"
+#~ msgstr "Pregled"
+
+#~ msgid "Status"
+#~ msgstr "Stanje"
+
+#~ msgid "Accept"
+#~ msgstr "Sprejmi"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Napačno ime modela v definiciji dejanja."
+
+#~ msgid "Total Difference"
+#~ msgstr "Skupna razlika"
+
+#~ msgid "Confirm Timesheet"
+#~ msgstr "Potrdi časovnico"
+
+#~ msgid "Timesheets by period"
+#~ msgstr "Časovnice po obdobjuh"
diff --git a/addons/hr_timesheet_sheet/i18n/sq.po b/addons/hr_timesheet_sheet/i18n/sq.po
index 4f8a5d37402..9e02bd04a50 100644
--- a/addons/hr_timesheet_sheet/i18n/sq.po
+++ b/addons/hr_timesheet_sheet/i18n/sq.po
@@ -7,23 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr ""
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -38,26 +35,40 @@ msgid "Sheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -66,15 +77,35 @@ msgid "Today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr ""
 
@@ -84,19 +115,14 @@ msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -105,7 +131,11 @@ msgid "Validate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr ""
 
@@ -114,6 +144,17 @@ msgstr ""
 msgid "Present"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -121,54 +162,57 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
@@ -177,30 +221,46 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr ""
 
@@ -216,28 +276,43 @@ msgid "Timesheet lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -251,8 +326,19 @@ msgid "Timesheet Lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -261,8 +347,20 @@ msgid "No employee defined"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -271,13 +369,16 @@ msgid "Configuration"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -286,9 +387,20 @@ msgid "Daily View"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -297,9 +409,14 @@ msgid "Sign In"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -308,72 +425,122 @@ msgid "Go to:"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: selection:hr_timesheet_sheet.sheet,state:0
-msgid "Draft"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
+msgid "In Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -382,13 +549,24 @@ msgid "Current Status"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -397,29 +575,79 @@ msgid "Timesheet by Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -428,24 +656,46 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -454,30 +704,58 @@ msgid "Timesheet by Accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -488,13 +766,26 @@ msgid "Attendances"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,name:0
-msgid "Description"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -502,11 +793,28 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -514,29 +822,36 @@ msgstr ""
 msgid "Difference"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -545,13 +860,13 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -560,39 +875,61 @@ msgid "Analytic accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
diff --git a/addons/hr_timesheet_sheet/i18n/sv.po b/addons/hr_timesheet_sheet/i18n/sv.po
index 04b831c1a93..0893075d3df 100644
--- a/addons/hr_timesheet_sheet/i18n/sv.po
+++ b/addons/hr_timesheet_sheet/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-22 21:07+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <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-11-23 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
@@ -51,11 +51,6 @@ msgstr "No employee defined for your user !"
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Invalid model name in the action definition."
-
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
@@ -281,8 +276,8 @@ msgid "Timesheet lines"
 msgstr "Timesheet lines"
 
 #. module: hr_timesheet_sheet
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -308,11 +303,6 @@ msgstr ""
 msgid "New"
 msgstr "New"
 
-#. module: hr_timesheet_sheet
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
 msgid "My Total Attendances By Week"
@@ -346,6 +336,11 @@ msgstr ""
 msgid "#Cost"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "No employee defined"
@@ -381,11 +376,6 @@ msgid ""
 "defined !"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
-
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
 msgid "Work on Task"
@@ -514,11 +504,6 @@ msgstr "Draft"
 msgid "Timesheet allowed difference(Hours)"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #, python-format
@@ -658,12 +643,6 @@ msgstr ""
 msgid "General Account"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: view:timesheet.report:0
-#: field:timesheet.report,to_invoice:0
-msgid "Type of Invoicing"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
 msgid ""
@@ -704,11 +683,6 @@ msgstr "Done"
 msgid "State is 'draft'."
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Cancel"
@@ -724,23 +698,11 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Timesheet by Accounts"
 msgstr "Timesheet by Accounts"
 
-#. module: hr_timesheet_sheet
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #, python-format
@@ -915,8 +877,9 @@ msgid "Analytic accounts"
 msgstr "Analytic accounts"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -973,9 +936,17 @@ msgstr "Total"
 msgid "Journal"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
 #~ msgid "Review end of day check day is complete"
 #~ msgstr "Review end of day check day is complete"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Invalid model name in the action definition."
+
 #~ msgid "My timesheets to confirm"
 #~ msgstr "My timesheets to confirm"
 
@@ -1057,6 +1028,9 @@ msgstr ""
 #~ msgid "Confirmed Timesheet"
 #~ msgstr "Confirmed Timesheet"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalid XML for View Architecture!"
+
 #~ msgid "Timesheets by period"
 #~ msgstr "Timesheets by period"
 
diff --git a/addons/hr_timesheet_sheet/i18n/tlh.po b/addons/hr_timesheet_sheet/i18n/tlh.po
index ef8a4a6f84a..4334e28bd3d 100644
--- a/addons/hr_timesheet_sheet/i18n/tlh.po
+++ b/addons/hr_timesheet_sheet/i18n/tlh.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr ""
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -37,26 +34,40 @@ msgid "Sheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -65,15 +76,35 @@ msgid "Today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr ""
 
@@ -83,19 +114,14 @@ msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -104,7 +130,11 @@ msgid "Validate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr ""
 
@@ -113,6 +143,17 @@ msgstr ""
 msgid "Present"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -120,54 +161,57 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
@@ -176,30 +220,46 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr ""
 
@@ -215,28 +275,43 @@ msgid "Timesheet lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -250,8 +325,19 @@ msgid "Timesheet Lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -260,8 +346,20 @@ msgid "No employee defined"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -270,13 +368,16 @@ msgid "Configuration"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -285,9 +386,20 @@ msgid "Daily View"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -296,9 +408,14 @@ msgid "Sign In"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -307,72 +424,122 @@ msgid "Go to:"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: selection:hr_timesheet_sheet.sheet,state:0
-msgid "Draft"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
+msgid "In Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -381,13 +548,24 @@ msgid "Current Status"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -396,29 +574,79 @@ msgid "Timesheet by Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -427,24 +655,46 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -453,30 +703,58 @@ msgid "Timesheet by Accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -487,13 +765,26 @@ msgid "Attendances"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,name:0
-msgid "Description"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -501,11 +792,28 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -513,29 +821,36 @@ msgstr ""
 msgid "Difference"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -544,13 +859,13 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -559,39 +874,61 @@ msgid "Analytic accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
diff --git a/addons/hr_timesheet_sheet/i18n/tr.po b/addons/hr_timesheet_sheet/i18n/tr.po
index 37925b2e82a..bd36665babd 100644
--- a/addons/hr_timesheet_sheet/i18n/tr.po
+++ b/addons/hr_timesheet_sheet/i18n/tr.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-09 07:22+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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr ""
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -37,26 +34,40 @@ msgid "Sheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr "Toplam Devam Süresi"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
-msgstr "Giriş-Çıkışlarımı Onayla"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -65,15 +76,35 @@ msgid "Today"
 msgstr "Bugün"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr "Zaman Tablosu"
 
@@ -83,28 +114,27 @@ msgid "Set to Draft"
 msgstr "Taslak olarak Ayarla"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
-msgstr ""
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "Bitiş Tarihi"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
-msgstr "Mevcut Giriş-Çıkış Çizelgem"
-
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
 msgid "Validate"
 msgstr "Onayla"
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr ""
 
@@ -113,6 +143,17 @@ msgstr ""
 msgid "Present"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -120,54 +161,57 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr "Toplam Fark"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr "Tel. Çağrısı Kodla"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr "Analiz Hesabı"
 
@@ -176,30 +220,46 @@ msgstr "Analiz Hesabı"
 msgid "Project Timesheet"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr "Başlangıç Tarihi"
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
-msgstr ""
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "Saat girişleri"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr "Onaylandı"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr "Devam Süresi"
 
@@ -215,28 +275,43 @@ msgid "Timesheet lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr "Yeni"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -250,8 +325,19 @@ msgid "Timesheet Lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -260,8 +346,20 @@ msgid "No employee defined"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -270,14 +368,17 @@ msgid "Configuration"
 msgstr "Ayarlar"
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
-msgstr "Hafta"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -285,9 +386,20 @@ msgid "Daily View"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr "Toplam Mesai"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -296,10 +408,15 @@ msgid "Sign In"
 msgstr "Giriş"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
-msgstr "Departmanıma Ait Giriş-Çıkış"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -307,73 +424,123 @@ msgid "Go to:"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
-msgstr "Tel. Çağrısı"
-
-#. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
-msgstr "Toplam Mesai"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr "Ay"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr "incele"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Draft"
 msgstr "Taslak"
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
-msgstr "Saat girişleri"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
-msgstr "Durum"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
-msgstr "Bitiş Tarihi"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr "Hafta"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -381,44 +548,105 @@ msgid "Current Status"
 msgstr "Mevcut Durum"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr "Kullanıcı"
+
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
 msgid "Timesheet by Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr "Tarih"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
-msgstr "Kullanıcı"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -427,25 +655,47 @@ msgstr ""
 msgid "Period"
 msgstr "Dönem"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr "Bitti"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
-msgstr "Mesai Kartı Satırı"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -453,31 +703,59 @@ msgid "Timesheet by Accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
-msgstr "Departmanıma Ait Onaylanacak Giriş-Çıkışlar"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Mesai Kartı Satırı"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -487,25 +765,55 @@ msgid "Attendances"
 msgstr "Devam Süreleri"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
+msgstr "Açıklama"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,name:0
-msgid "Description"
-msgstr "Açıklama"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign Out"
 msgstr "Çıkış"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -513,29 +821,36 @@ msgstr ""
 msgid "Difference"
 msgstr "Fark"
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -544,13 +859,13 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -559,39 +874,97 @@ msgid "Analytic accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
-msgstr "Giriş-Çıkış Çizelgem"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr "Güncel Tarih"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr "Toplam"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
-msgstr "Departmanıma Ait Doğrulanacak Giriş-Çıkışlar"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
+
+#~ msgid "My timesheets to confirm"
+#~ msgstr "Giriş-Çıkışlarımı Onayla"
+
+#~ msgid "My Current Timesheet"
+#~ msgstr "Mevcut Giriş-Çıkış Çizelgem"
+
+#~ msgid "Total Difference"
+#~ msgstr "Toplam Fark"
+
+#~ msgid "Phone call encoding"
+#~ msgstr "Tel. Çağrısı Kodla"
+
+#~ msgid "My Department's Timesheet"
+#~ msgstr "Departmanıma Ait Giriş-Çıkış"
+
+#~ msgid "Phone call"
+#~ msgstr "Tel. Çağrısı"
+
+#~ msgid "Review"
+#~ msgstr "incele"
+
+#~ msgid "Status"
+#~ msgstr "Durum"
+
+#~ msgid "My Department's Timesheet to Confirm"
+#~ msgstr "Departmanıma Ait Onaylanacak Giriş-Çıkışlar"
+
+#~ msgid "My timesheets"
+#~ msgstr "Giriş-Çıkış Çizelgem"
+
+#~ msgid "My Department's Timesheet to Validate"
+#~ msgstr "Departmanıma Ait Doğrulanacak Giriş-Çıkışlar"
diff --git a/addons/hr_timesheet_sheet/i18n/uk.po b/addons/hr_timesheet_sheet/i18n/uk.po
index b00f08645cb..0cb9321ff9d 100644
--- a/addons/hr_timesheet_sheet/i18n/uk.po
+++ b/addons/hr_timesheet_sheet/i18n/uk.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 11:52+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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr ""
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -37,27 +34,41 @@ msgid "Sheet"
 msgstr "Лист"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr "Всього відвідувань"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
-msgstr "Мої табелі до прийняття"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
-msgstr "Тривалість робочого часу"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -65,15 +76,35 @@ msgid "Today"
 msgstr "Сьогодні"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr "Табель"
 
@@ -83,28 +114,27 @@ msgid "Set to Draft"
 msgstr "Зробити чорновиком"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
-msgstr ""
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "По дату"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
-msgstr "Мій поточний табель"
-
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
 msgid "Validate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr "День"
 
@@ -113,6 +143,17 @@ msgstr "День"
 msgid "Present"
 msgstr "Присутній"
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -120,56 +161,57 @@ msgid "Refuse"
 msgstr "Відмовити"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
-msgstr ""
-"Дозволена різниця між входом/виходом і розрахунком табелю для одного табеля. "
-"Встановіть значення 0, якщо контроль непотрібний."
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr "Аналітичний рахунок"
 
@@ -178,30 +220,46 @@ msgstr "Аналітичний рахунок"
 msgid "Project Timesheet"
 msgstr "Табель проекту"
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr "Дата з"
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
-msgstr ""
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "Табелі"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr "Підтверджений"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr "Відвідування"
 
@@ -217,28 +275,43 @@ msgid "Timesheet lines"
 msgstr "Записи табелю"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr "Новий"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -252,8 +325,19 @@ msgid "Timesheet Lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -262,8 +346,20 @@ msgid "No employee defined"
 msgstr "Невідомий працівник"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -272,14 +368,17 @@ msgid "Configuration"
 msgstr "Налаштування"
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
-msgstr "Тиждень"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури Вигляду!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -287,10 +386,21 @@ msgid "Daily View"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
-msgstr "Табель за період"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr "Всього по табелю"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -298,9 +408,14 @@ msgid "Sign In"
 msgstr "Вхід"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -309,73 +424,123 @@ msgid "Go to:"
 msgstr "Перехід до:"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
-msgstr "Всього по табелю"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr "Місяць"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Draft"
 msgstr "Чорновик"
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
-msgstr "Табелі"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
-msgstr "По дату"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr "Тиждень"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -383,45 +548,106 @@ msgid "Current Status"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr "Користувач"
+
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
 msgid "Timesheet by Account"
 msgstr "Табель за рахунками"
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr "Дата"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
-msgstr "Користувач"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
-msgstr "Дозволена різниця у табелі"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -429,24 +655,46 @@ msgstr "Дозволена різниця у табелі"
 msgid "Period"
 msgstr "Період"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr "Готовий"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -455,31 +703,58 @@ msgid "Timesheet by Accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -490,25 +765,55 @@ msgid "Attendances"
 msgstr "Відвідування"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
+msgstr "Опис"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,name:0
-msgid "Description"
-msgstr "Опис"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign Out"
 msgstr "Вихід"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -516,29 +821,36 @@ msgstr ""
 msgid "Difference"
 msgstr "Різниця"
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -547,13 +859,13 @@ msgid "Invoice rate"
 msgstr "Норма накладних"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -562,39 +874,100 @@ msgid "Analytic accounts"
 msgstr "Аналітичні рахунки"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
-msgstr "Мої табелі"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
-msgstr "Прийняти"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr "Поточна дата"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
-msgstr "Незатверджені табелі"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr "Рік"
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
+
+#~ msgid "My timesheets to confirm"
+#~ msgstr "Мої табелі до прийняття"
+
+#~ msgid "Timeshet range"
+#~ msgstr "Тривалість робочого часу"
+
+#~ msgid "My Current Timesheet"
+#~ msgstr "Мій поточний табель"
+
+#~ msgid ""
+#~ "Allowed difference between the sign in/out and the timesheet computation for "
+#~ "one sheet. Set this to 0 if you do not want any control."
+#~ msgstr ""
+#~ "Дозволена різниця між входом/виходом і розрахунком табелю для одного табеля. "
+#~ "Встановіть значення 0, якщо контроль непотрібний."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильний XML для Архітектури Вигляду!"
+
+#~ msgid "Timesheets by period"
+#~ msgstr "Табель за період"
+
+#~ msgid "Timesheet allowed difference"
+#~ msgstr "Дозволена різниця у табелі"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
+
+#~ msgid "My timesheets"
+#~ msgstr "Мої табелі"
+
+#~ msgid "Accept"
+#~ msgstr "Прийняти"
+
+#~ msgid "Unvalidated Timesheets"
+#~ msgstr "Незатверджені табелі"
diff --git a/addons/hr_timesheet_sheet/i18n/vi.po b/addons/hr_timesheet_sheet/i18n/vi.po
index 6d01a6ae753..9d1048905f2 100644
--- a/addons/hr_timesheet_sheet/i18n/vi.po
+++ b/addons/hr_timesheet_sheet/i18n/vi.po
@@ -7,23 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr ""
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -38,26 +35,40 @@ msgid "Sheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -66,15 +77,35 @@ msgid "Today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr ""
 
@@ -84,19 +115,14 @@ msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -105,7 +131,11 @@ msgid "Validate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr ""
 
@@ -114,6 +144,17 @@ msgstr ""
 msgid "Present"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -121,54 +162,57 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
@@ -177,30 +221,46 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr ""
 
@@ -216,28 +276,43 @@ msgid "Timesheet lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -251,8 +326,19 @@ msgid "Timesheet Lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -261,8 +347,20 @@ msgid "No employee defined"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -271,13 +369,16 @@ msgid "Configuration"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -286,9 +387,20 @@ msgid "Daily View"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -297,9 +409,14 @@ msgid "Sign In"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -308,72 +425,122 @@ msgid "Go to:"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: selection:hr_timesheet_sheet.sheet,state:0
-msgid "Draft"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
+msgid "In Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -382,13 +549,24 @@ msgid "Current Status"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -397,29 +575,79 @@ msgid "Timesheet by Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -428,24 +656,46 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -454,30 +704,58 @@ msgid "Timesheet by Accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -488,13 +766,26 @@ msgid "Attendances"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,name:0
-msgid "Description"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -502,11 +793,28 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -514,29 +822,36 @@ msgstr ""
 msgid "Difference"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -545,13 +860,13 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -560,39 +875,61 @@ msgid "Analytic accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
diff --git a/addons/hr_timesheet_sheet/i18n/zh_CN.po b/addons/hr_timesheet_sheet/i18n/zh_CN.po
index 6bbda7a0688..10aa72ff2ed 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_CN.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 06:32+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr "完成每天检查审查结束"
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -37,27 +34,41 @@ msgid "Sheet"
 msgstr "表"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "在动作定义中使用了无效的模快名。"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr "出勤合计"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
-msgstr "确认我的时间表"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
-msgstr "时间表范围"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -65,15 +76,35 @@ msgid "Today"
 msgstr "今天"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
-msgstr "确认时间表"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr "时间表"
 
@@ -83,20 +114,15 @@ msgid "Set to Draft"
 msgstr "设为草稿"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
-msgstr "定义员工时间表条目"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "日期到"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr "时间表草稿"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
-msgstr "我当前的时间表"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -104,7 +130,11 @@ msgid "Validate"
 msgstr "确认"
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr "天"
 
@@ -113,6 +143,17 @@ msgstr "天"
 msgid "Present"
 msgstr "现在"
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -120,54 +161,57 @@ msgid "Refuse"
 msgstr "拒绝"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr "批准时间表"
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr "你必须选择一个当前日期是在时间表的日期中"
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr "差异合计"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr "电话呼叫编码"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr "时间表按天"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr "定义在时间表明细中工作任务条目"
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
-msgstr "允许在签出签入的差和计算时间表.如果你不想控制设为0"
+"You cannot enter an attendance date outside the current timesheet dates!"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
-msgstr "时间表按的多天"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
-msgstr "时间表确认结束在这周/月"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr "辅助核算项"
 
@@ -176,30 +220,46 @@ msgstr "辅助核算项"
 msgid "Project Timesheet"
 msgstr "项目时间表"
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr "日期从"
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
-msgstr "人力资源时间表进程"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
-msgstr "辅助核算成本"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "时间表"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr "已确认"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr "出勤"
 
@@ -215,29 +275,44 @@ msgid "Timesheet lines"
 msgstr "时间表明细"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
-msgstr "你的时间表明细编码"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
-msgstr "确认时间表"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
-msgstr "项目经理控制"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr "新的"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
-msgstr "时间表表确认的结束期间"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
@@ -250,9 +325,20 @@ msgid "Timesheet Lines"
 msgstr "时间表明细"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
-msgstr "确认时间表的结束期间"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -260,9 +346,21 @@ msgid "No employee defined"
 msgstr "没定义员工"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
-msgstr "确认时间表"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
@@ -270,14 +368,17 @@ msgid "Configuration"
 msgstr "设置"
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
-msgstr "周"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效的视图结构xml文件!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -285,10 +386,21 @@ msgid "Daily View"
 msgstr "每天视图"
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
-msgstr "时间表期间"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr "总时间表"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -296,10 +408,15 @@ msgid "Sign In"
 msgstr "签入"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
-msgstr "我部门的时间表"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -307,73 +424,123 @@ msgid "Go to:"
 msgstr "到:"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
-msgstr "电话呼叫"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
-msgstr "总时间表"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr "工作审查"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
-msgstr "在这周的发票"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr "月份"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr "编码你的小时和签入/签出"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr "审查"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Draft"
 msgstr "草稿"
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
-msgstr "时间表"
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
-msgstr "时间表确认"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
-msgstr "状态"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
-msgstr "日期到"
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr "周"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -381,14 +548,25 @@ msgid "Current Status"
 msgstr "当前状态"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
-msgstr "时间表的发票"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
-msgstr "发票基于时间表"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr "用户"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
@@ -396,30 +574,80 @@ msgid "Timesheet by Account"
 msgstr "科目(项)时间表"
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr "日期"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
-msgstr "用户"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
-msgstr "基于时间表创建发票"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
-msgstr "时间表批准"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
-msgstr "时间表允许差异"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -427,25 +655,47 @@ msgstr "时间表允许差异"
 msgid "Period"
 msgstr "期间"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr "完成"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
-msgstr "时间表出勤登入条目"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
-msgstr "创建你的辅助核算成本"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
-msgstr "时间表明细"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -453,31 +703,59 @@ msgid "Timesheet by Accounts"
 msgstr "时间表项"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
-msgstr "项目管理批准的时间表"
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
-msgstr "你花费的电话呼叫时间"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
-msgstr "批准时间表"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
-msgstr "确认我部门的时间表"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "时间表明细"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -487,25 +765,55 @@ msgid "Attendances"
 msgstr "出勤"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
-msgstr "创建辅助核算成本"
-
-#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,name:0
 #: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
 msgid "Description"
 msgstr "说明"
 
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign Out"
 msgstr "签出"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr "按天"
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -513,30 +821,37 @@ msgstr "按天"
 msgid "Difference"
 msgstr "差异"
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr "缺席"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
-msgstr "在此期间结束周/月"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
-msgstr "时间表条目进入到草稿状态"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
-msgstr "已创建的辅助核算成本"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -544,14 +859,14 @@ msgid "Invoice rate"
 msgstr "发票税率"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
-msgstr "编码花费多少时间来完成电话呼叫"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
+msgstr "在这周的发票"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
-msgstr "你工作审查结束日期"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -559,42 +874,73 @@ msgid "Analytic accounts"
 msgstr "辅助核算项"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
-msgstr "我的时间表"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
-msgstr "同意"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr "当前日期"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
-msgstr "不确认的时间表"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr "年"
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr "合计"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
-msgstr "确认我部门的时间表"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#~ msgid "My timesheets to confirm"
+#~ msgstr "确认我的时间表"
+
+#~ msgid "Timeshet range"
+#~ msgstr "时间表范围"
+
+#~ msgid "Confirm timesheet sheet"
+#~ msgstr "确认时间表"
 
 #~ msgid ""
 #~ "\n"
@@ -635,3 +981,165 @@ msgstr "确认我部门的时间表"
 #~ "    *周期大小(日,周,月,年)\n"
 #~ "    *在时间表和出勤的最大差别\n"
 #~ "    "
+
+#~ msgid "Defines employee's timesheet entry"
+#~ msgstr "定义员工时间表条目"
+
+#~ msgid "Draft Timesheet sheet"
+#~ msgstr "时间表草稿"
+
+#~ msgid "My Current Timesheet"
+#~ msgstr "我当前的时间表"
+
+#~ msgid "Validated Timesheet"
+#~ msgstr "批准时间表"
+
+#~ msgid "You must select a Current date wich is in the timesheet dates !"
+#~ msgstr "你必须选择一个当前日期是在时间表的日期中"
+
+#~ msgid "Phone call encoding"
+#~ msgstr "电话呼叫编码"
+
+#~ msgid "Timesheet by Day"
+#~ msgstr "时间表按天"
+
+#~ msgid "Defines the task work entry into timesheet line"
+#~ msgstr "定义在时间表明细中工作任务条目"
+
+#~ msgid ""
+#~ "Allowed difference between the sign in/out and the timesheet computation for "
+#~ "one sheet. Set this to 0 if you do not want any control."
+#~ msgstr "允许在签出签入的差和计算时间表.如果你不想控制设为0"
+
+#~ msgid "timesheet is confirmed at the end of the week / month"
+#~ msgstr "时间表确认结束在这周/月"
+
+#~ msgid "Analytic cost"
+#~ msgstr "辅助核算成本"
+
+#~ msgid "Confirm Timesheet"
+#~ msgstr "确认时间表"
+
+#~ msgid "Control by the project manager"
+#~ msgstr "项目经理控制"
+
+#~ msgid "Confirmed Timesheet"
+#~ msgstr "确认时间表"
+
+#~ msgid "My Department's Timesheet"
+#~ msgstr "我部门的时间表"
+
+#~ msgid "Phone call"
+#~ msgstr "电话呼叫"
+
+#~ msgid "Review of work"
+#~ msgstr "工作审查"
+
+#~ msgid "Encode Your hours and Sign in / out"
+#~ msgstr "编码你的小时和签入/签出"
+
+#~ msgid "Review"
+#~ msgstr "审查"
+
+#~ msgid "Timesheets To Confirm"
+#~ msgstr "时间表确认"
+
+#~ msgid "Status"
+#~ msgstr "状态"
+
+#~ msgid "Invoice based on timesheet"
+#~ msgstr "发票基于时间表"
+
+#~ msgid "Creates invoice based on timesheet"
+#~ msgstr "基于时间表创建发票"
+
+#~ msgid "Timesheets To Validate"
+#~ msgstr "时间表批准"
+
+#~ msgid "Attendance entry moves into the timesheet"
+#~ msgstr "时间表出勤登入条目"
+
+#~ msgid "Creates your analytic cost accoording to quantity"
+#~ msgstr "创建你的辅助核算成本"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+
+#~ msgid "Timesheet is validate by project manager."
+#~ msgstr "项目管理批准的时间表"
+
+#~ msgid "Validate Timesheet"
+#~ msgstr "批准时间表"
+
+#~ msgid "My Department's Timesheet to Confirm"
+#~ msgstr "确认我部门的时间表"
+
+#~ msgid "Create Analytic cost"
+#~ msgstr "创建辅助核算成本"
+
+#~ msgid "timesheet entry is into draft state."
+#~ msgstr "时间表条目进入到草稿状态"
+
+#~ msgid "Analytic cost is created"
+#~ msgstr "已创建的辅助核算成本"
+
+#~ msgid "Encode how much time u spent on phone call"
+#~ msgstr "编码花费多少时间来完成电话呼叫"
+
+#~ msgid "Review of your work at the end of the day"
+#~ msgstr "你工作审查结束日期"
+
+#~ msgid "My timesheets"
+#~ msgstr "我的时间表"
+
+#~ msgid "Accept"
+#~ msgstr "同意"
+
+#~ msgid "Review end of day check day is complete"
+#~ msgstr "完成每天检查审查结束"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "在动作定义中使用了无效的模快名。"
+
+#~ msgid "Total Difference"
+#~ msgstr "差异合计"
+
+#~ msgid "Timesheet by Days"
+#~ msgstr "时间表按的多天"
+
+#~ msgid "Encode your timesheet line"
+#~ msgstr "你的时间表明细编码"
+
+#~ msgid "Hr Timesheet Process"
+#~ msgstr "人力资源时间表进程"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效的视图结构xml文件!"
+
+#~ msgid "Confirm timesheet at the end of the period"
+#~ msgstr "确认时间表的结束期间"
+
+#~ msgid "Timesheet sheet confirm at the end of the period"
+#~ msgstr "时间表表确认的结束期间"
+
+#~ msgid "Timesheets by period"
+#~ msgstr "时间表期间"
+
+#~ msgid "Invoice on timesheet"
+#~ msgstr "时间表的发票"
+
+#~ msgid "Timesheet allowed difference"
+#~ msgstr "时间表允许差异"
+
+#~ msgid "Whatever time u spent for phone call"
+#~ msgstr "你花费的电话呼叫时间"
+
+#~ msgid "At the end of the period (week/month)"
+#~ msgstr "在此期间结束周/月"
+
+#~ msgid "Unvalidated Timesheets"
+#~ msgstr "不确认的时间表"
+
+#~ msgid "My Department's Timesheet to Validate"
+#~ msgstr "确认我部门的时间表"
diff --git a/addons/hr_timesheet_sheet/i18n/zh_TW.po b/addons/hr_timesheet_sheet/i18n/zh_TW.po
index 88cf83c45ed..1f9818e8ed5 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_TW.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_TW.po
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-01-30 13:14+0000\n"
 "Last-Translator: <>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr ""
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -37,26 +34,40 @@ msgid "Sheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -65,15 +76,35 @@ msgid "Today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr ""
 
@@ -83,19 +114,14 @@ msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -104,7 +130,11 @@ msgid "Validate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr ""
 
@@ -113,6 +143,17 @@ msgstr ""
 msgid "Present"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -120,54 +161,57 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
@@ -176,30 +220,46 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr ""
 
@@ -215,28 +275,43 @@ msgid "Timesheet lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -250,8 +325,19 @@ msgid "Timesheet Lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -260,8 +346,20 @@ msgid "No employee defined"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -270,13 +368,16 @@ msgid "Configuration"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -285,9 +386,20 @@ msgid "Daily View"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -296,9 +408,14 @@ msgid "Sign In"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -307,72 +424,122 @@ msgid "Go to:"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: selection:hr_timesheet_sheet.sheet,state:0
-msgid "Draft"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
+msgid "In Draft"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -381,13 +548,24 @@ msgid "Current Status"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -396,29 +574,79 @@ msgid "Timesheet by Account"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -427,24 +655,46 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -453,30 +703,58 @@ msgid "Timesheet by Accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -487,13 +765,26 @@ msgid "Attendances"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,name:0
-msgid "Description"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -501,11 +792,28 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -513,29 +821,36 @@ msgstr ""
 msgid "Difference"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -544,13 +859,13 @@ msgid "Invoice rate"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -559,39 +874,61 @@ msgid "Analytic accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
 msgstr ""
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/de.po b/addons/html_view/i18n/de.po
index ef346685445..a91279cc2ec 100644
--- a/addons/html_view/i18n/de.po
+++ b/addons/html_view/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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-30 16:14+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,36 +15,13 @@ 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-01 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: html_view
-#: 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 !"
-
-#. module: html_view
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
-#. module: html_view
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Die Objektbezeichnung muss mit x_ beginnen und darf keine Sonderzeichen "
-"beinhalten!"
-
-#. module: html_view
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#. module: html_view
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Bezeichnung"
 
 #. module: html_view
 #: field:html.view,comp_id:0
@@ -62,11 +39,6 @@ msgstr "Html Test"
 msgid "Html Example"
 msgstr "Html Beispiel"
 
-#. module: html_view
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
 #. module: html_view
 #: model:ir.module.module,shortdesc:html_view.module_meta_information
 msgid "Html View"
@@ -82,12 +54,26 @@ msgstr "Banken"
 msgid "html.view"
 msgstr ""
 
-#. module: html_view
-#: 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 "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
 
-#. module: html_view
-#: field:html.view,name:0
-msgid "Name"
-msgstr "Bezeichnung"
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Die Objektbezeichnung muss mit x_ beginnen und darf keine Sonderzeichen "
+#~ "beinhalten!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/html_view/i18n/es.po b/addons/html_view/i18n/es.po
index 403c68edc3d..5710d01ddd4 100644
--- a/addons/html_view/i18n/es.po
+++ b/addons/html_view/i18n/es.po
@@ -7,43 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-29 07:51+0000\n"
 "Last-Translator: OpenERP Administrators <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-11-30 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: html_view
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El Id del certificado debe ser único!"
-
-#. module: html_view
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la estructura de la vista!"
-
-#. module: html_view
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: html_view
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de la acción."
-
-#. module: html_view
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Nombre"
 
 #. module: html_view
 #: field:html.view,comp_id:0
@@ -61,11 +38,6 @@ msgstr "Prueba html"
 msgid "Html Example"
 msgstr "Ejemplo html"
 
-#. module: html_view
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
-
 #. module: html_view
 #: model:ir.module.module,shortdesc:html_view.module_meta_information
 msgid "Html View"
@@ -81,12 +53,26 @@ msgstr "Bancos"
 msgid "html.view"
 msgstr "html.view"
 
-#. module: html_view
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
 
-#. module: html_view
-#: field:html.view,name:0
-msgid "Name"
-msgstr "Nombre"
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura de la vista!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El Id del certificado debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/html_view/i18n/fr.po b/addons/html_view/i18n/fr.po
index 953a2f47871..be110c4a7c7 100644
--- a/addons/html_view/i18n/fr.po
+++ b/addons/html_view/i18n/fr.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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-24 09:40+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -15,34 +15,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-25 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: html_view
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: html_view
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: html_view
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: html_view
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: html_view
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Nom"
 
 #. module: html_view
 #: field:html.view,comp_id:0
@@ -60,11 +39,6 @@ msgstr "Test HTML"
 msgid "Html Example"
 msgstr "Exemple de HTML"
 
-#. module: html_view
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: html_view
 #: model:ir.module.module,shortdesc:html_view.module_meta_information
 msgid "Html View"
@@ -79,13 +53,3 @@ msgstr "Banques"
 #: model:ir.model,name:html_view.model_html_view
 msgid "html.view"
 msgstr "html.view"
-
-#. module: html_view
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: html_view
-#: field:html.view,name:0
-msgid "Name"
-msgstr "Nom"
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/it.po b/addons/html_view/i18n/it.po
index 1c033fca81e..82f0ab74497 100644
--- a/addons/html_view/i18n/it.po
+++ b/addons/html_view/i18n/it.po
@@ -7,43 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-22 07:33+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-23 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: html_view
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "L'ID certificato del modulo deve essere unico!"
-
-#. module: html_view
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per la struttura della vista!"
-
-#. module: html_view
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per “x_” e non contenere alcun carattere "
-"speciale!"
-
-#. module: html_view
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome del modello non valido nella definizione dell'azione."
-
-#. module: html_view
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere unico!"
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Nome"
 
 #. module: html_view
 #: field:html.view,comp_id:0
@@ -61,11 +38,6 @@ msgstr "Test HTML"
 msgid "Html Example"
 msgstr "Esempio HTML"
 
-#. module: html_view
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
 #. module: html_view
 #: model:ir.module.module,shortdesc:html_view.module_meta_information
 msgid "Html View"
@@ -81,12 +53,26 @@ msgstr "Banche"
 msgid "html.view"
 msgstr "html.view"
 
-#. module: html_view
-#: 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 iniziare per “x_” e non contenere alcun carattere "
+#~ "speciale!"
 
-#. module: html_view
-#: field:html.view,name:0
-msgid "Name"
-msgstr "Nome"
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome del modello non valido nella definizione dell'azione."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per la struttura della vista!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "L'ID certificato del modulo deve essere unico!"
+
+#~ 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/html_view/i18n/nb.po b/addons/html_view/i18n/nb.po
index 870b62bfa90..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-14 05:37+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/html_view/i18n/nl.po b/addons/html_view/i18n/nl.po
index f8023e5c2bf..bd0218effac 100644
--- a/addons/html_view/i18n/nl.po
+++ b/addons/html_view/i18n/nl.po
@@ -7,42 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-12-02 07:50+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-12-03 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: html_view
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#. module: html_view
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave opbouw!"
-
-#. module: html_view
-#: 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: html_view
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de actie definitie."
-
-#. module: html_view
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "De modulenaam moet uniek zijn !"
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Naam"
 
 #. module: html_view
 #: field:html.view,comp_id:0
@@ -60,11 +38,6 @@ msgstr "Html test"
 msgid "Html Example"
 msgstr "Html voorbeeld"
 
-#. module: html_view
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fout ! U kunt geen recursief menu maken."
-
 #. module: html_view
 #: model:ir.module.module,shortdesc:html_view.module_meta_information
 msgid "Html View"
@@ -80,12 +53,25 @@ msgstr "Banken"
 msgid "html.view"
 msgstr "html.view"
 
-#. module: html_view
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
+#~ 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: html_view
-#: field:html.view,name:0
-msgid "Name"
-msgstr "Naam"
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ongeldige modelnaam in de actie definitie."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML voor weergave opbouw!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "De modulenaam moet uniek zijn !"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fout ! U kunt geen recursief menu maken."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/html_view/i18n/pt.po b/addons/html_view/i18n/pt.po
index cac564dc269..40e3345a47e 100644
--- a/addons/html_view/i18n/pt.po
+++ b/addons/html_view/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-05 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: html_view
diff --git a/addons/html_view/i18n/pt_BR.po b/addons/html_view/i18n/pt_BR.po
index 70bc5bfbb51..85cc8ae62e2 100644
--- a/addons/html_view/i18n/pt_BR.po
+++ b/addons/html_view/i18n/pt_BR.po
@@ -7,43 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-27 02:57+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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-28 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: html_view
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "O ID de certificado do módulo precisa ser único !"
-
-#. module: html_view
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para Arquitetura da View"
-
-#. module: html_view
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-"especial!"
-
-#. module: html_view
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da ação."
-
-#. module: html_view
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo precisa ser único !"
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Nome"
 
 #. module: html_view
 #: field:html.view,comp_id:0
@@ -61,11 +38,6 @@ msgstr "Teste Html"
 msgid "Html Example"
 msgstr "Exemplo Html"
 
-#. module: html_view
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Erro ! Você não pode criar Menu recursivo."
-
 #. module: html_view
 #: model:ir.module.module,shortdesc:html_view.module_meta_information
 msgid "Html View"
@@ -81,12 +53,26 @@ msgstr "Bancos"
 msgid "html.view"
 msgstr "html.view"
 
-#. module: html_view
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "O tamanho do campo nunca pode ser menor que 1 !"
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
+#~ "especial!"
 
-#. module: html_view
-#: field:html.view,name:0
-msgid "Name"
-msgstr "Nome"
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de modelo inválido na definição da ação."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para Arquitetura da View"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID de certificado do módulo precisa ser único !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "O nome do módulo precisa ser único !"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Erro ! Você não pode criar Menu recursivo."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/html_view/i18n/ro.po b/addons/html_view/i18n/ro.po
index e86b65c7db2..e1106d8527b 100644
--- a/addons/html_view/i18n/ro.po
+++ b/addons/html_view/i18n/ro.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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: html_view
diff --git a/addons/html_view/i18n/ru.po b/addons/html_view/i18n/ru.po
index 830693c279b..2030283e325 100644
--- a/addons/html_view/i18n/ru.po
+++ b/addons/html_view/i18n/ru.po
@@ -7,43 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-29 07:51+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-30 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: html_view
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#. module: html_view
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Некорректный формат XML для структуры вида!"
-
-#. module: html_view
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
-#. module: html_view
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
-#. module: html_view
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Название модуля должно быть уникальным !"
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Название"
 
 #. module: html_view
 #: field:html.view,comp_id:0
@@ -61,11 +38,6 @@ msgstr ""
 msgid "Html Example"
 msgstr ""
 
-#. module: html_view
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
 #. module: html_view
 #: model:ir.module.module,shortdesc:html_view.module_meta_information
 msgid "Html View"
@@ -81,12 +53,26 @@ msgstr "Банки"
 msgid "html.view"
 msgstr ""
 
-#. module: html_view
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Размер поля не может быть меньше 1 !"
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
 
-#. module: html_view
-#: field:html.view,name:0
-msgid "Name"
-msgstr "Название"
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Недопустимое имя модели в определении действия."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Некорректный формат XML для структуры вида!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Название модуля должно быть уникальным !"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Размер поля не может быть меньше 1 !"
diff --git a/addons/html_view/i18n/sr.po b/addons/html_view/i18n/sr.po
index b7f63fc8e8d..1d07950bcd0 100644
--- a/addons/html_view/i18n/sr.po
+++ b/addons/html_view/i18n/sr.po
@@ -7,32 +7,20 @@ 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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-14 08:04+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-15 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: html_view
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neispravan XML za pregled arhitekture!"
-
-#. module: html_view
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#. module: html_view
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Neispravno ime modela u definiciji akcije."
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Ime"
 
 #. module: html_view
 #: field:html.view,comp_id:0
@@ -50,11 +38,6 @@ msgstr "Html Test"
 msgid "Html Example"
 msgstr "Html Primer"
 
-#. module: html_view
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
 #. module: html_view
 #: model:ir.module.module,shortdesc:html_view.module_meta_information
 msgid "Html View"
@@ -70,7 +53,16 @@ msgstr "Banke"
 msgid "html.view"
 msgstr "html.view"
 
-#. module: html_view
-#: field:html.view,name:0
-msgid "Name"
-msgstr "Ime"
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neispravno ime modela u definiciji akcije."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neispravan XML za pregled arhitekture!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
diff --git a/addons/html_view/i18n/sv.po b/addons/html_view/i18n/sv.po
index 271a24b064e..baedf22ec47 100644
--- a/addons/html_view/i18n/sv.po
+++ b/addons/html_view/i18n/sv.po
@@ -7,42 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-24 09:37+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-11-25 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: html_view
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Certifikat ID för modulen måste vara unik!"
-
-#. module: html_view
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ogiltig XML för Vy-arkitektur!"
-
-#. module: html_view
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#. module: html_view
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
-
-#. module: html_view
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Namnet på modulen måste vara unikt!"
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Namn"
 
 #. module: html_view
 #: field:html.view,comp_id:0
@@ -60,11 +38,6 @@ msgstr "Html test"
 msgid "Html Example"
 msgstr "Html exempel"
 
-#. module: html_view
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fel! Ni kan inte skapa recursiva menyer"
-
 #. module: html_view
 #: model:ir.module.module,shortdesc:html_view.module_meta_information
 msgid "Html View"
@@ -80,12 +53,25 @@ msgstr "Banker"
 msgid "html.view"
 msgstr ""
 
-#. module: html_view
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Fältstorleken kan inte vara mindre än ett!"
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
-#. module: html_view
-#: field:html.view,name:0
-msgid "Name"
-msgstr "Namn"
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ogiltig XML för Vy-arkitektur!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Certifikat ID för modulen måste vara unik!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Namnet på modulen måste vara unikt!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fel! Ni kan inte skapa recursiva menyer"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Fältstorleken kan inte vara mindre än ett!"
diff --git a/addons/html_view/i18n/zh_CN.po b/addons/html_view/i18n/zh_CN.po
index f3f923fb7ff..fa342871af4 100644
--- a/addons/html_view/i18n/zh_CN.po
+++ b/addons/html_view/i18n/zh_CN.po
@@ -7,41 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-25 19:06+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-11-26 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: html_view
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: html_view
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: html_view
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: html_view
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: html_view
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
+#: field:html.view,name:0
+msgid "Name"
+msgstr "名称"
 
 #. module: html_view
 #: field:html.view,comp_id:0
@@ -59,11 +38,6 @@ msgstr ""
 msgid "Html Example"
 msgstr ""
 
-#. module: html_view
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: html_view
 #: model:ir.module.module,shortdesc:html_view.module_meta_information
 msgid "Html View"
@@ -79,12 +53,5 @@ msgstr "银行"
 msgid "html.view"
 msgstr "HTML 视图"
 
-#. module: html_view
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "字段的长度不小于1"
-
-#. module: html_view
-#: field:html.view,name:0
-msgid "Name"
-msgstr "名称"
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "字段的长度不小于1"
diff --git a/addons/idea/i18n/fr.po b/addons/idea/i18n/fr.po
index 9a36b96b41f..e6e1363058b 100644
--- a/addons/idea/i18n/fr.po
+++ b/addons/idea/i18n/fr.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:43+0000\n"
-"PO-Revision-Date: 2010-12-13 16:57+0000\n"
+"PO-Revision-Date: 2010-12-15 03:16+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-14 05:18+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/ar.po b/addons/l10n_be/i18n/ar.po
index 3aaa4618e51..bedd36f811c 100644
--- a/addons/l10n_be/i18n/ar.po
+++ b/addons/l10n_be/i18n/ar.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,9 +126,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/bg.po b/addons/l10n_be/i18n/bg.po
index 5456249cd6e..4c32ea5fa4a 100644
--- a/addons/l10n_be/i18n/bg.po
+++ b/addons/l10n_be/i18n/bg.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 12:47+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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,10 +126,9 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
-msgstr ""
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
+msgstr "XML файлът е създаден."
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_financiers
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr "Избери фискална година"
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr "Ограчение на сметка"
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr "XML файлът е създаден."
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/bs.po b/addons/l10n_be/i18n/bs.po
index 79854382b87..6b010c91422 100644
--- a/addons/l10n_be/i18n/bs.po
+++ b/addons/l10n_be/i18n/bs.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 08:46+0000\n"
 "Last-Translator: Miro Glavić <glavicmiro@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-10-31 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,9 +126,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/ca.po b/addons/l10n_be/i18n/ca.po
index 51859652e79..aa141f8fe2a 100644
--- a/addons/l10n_be/i18n/ca.po
+++ b/addons/l10n_be/i18n/ca.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-13 10:00+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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,10 +126,9 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
-msgstr ""
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
+msgstr "Fitxer XML ha estat creat."
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_financiers
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr "Selecciona exercici fiscal"
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr "Import límit"
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr "Fitxer XML ha estat creat."
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/cs.po b/addons/l10n_be/i18n/cs.po
index 4badf89b2a0..6249e2666ac 100644
--- a/addons/l10n_be/i18n/cs.po
+++ b/addons/l10n_be/i18n/cs.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-17 06:57+0000\n"
 "Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,9 +126,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/de.po b/addons/l10n_be/i18n/de.po
index 70ed5a2b59f..b7159446079 100644
--- a/addons/l10n_be/i18n/de.po
+++ b/addons/l10n_be/i18n/de.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2008-09-24 19:27+0000\n"
 "Last-Translator: <>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,9 +126,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/es.po b/addons/l10n_be/i18n/es.po
index 135f4bc657f..ddd0900f918 100644
--- a/addons/l10n_be/i18n/es.po
+++ b/addons/l10n_be/i18n/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 09:26+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -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-10-31 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -33,11 +33,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr "Régimen Intra-Comunitario"
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -132,10 +127,9 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr "No hay Número de IVA asociado conla empresa principal!"
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
-msgstr ""
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
+msgstr "El archivo XML ha sido Creado."
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_financiers
@@ -159,14 +153,15 @@ msgid "Régime National"
 msgstr "Régimen Nacional"
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
-msgstr "Régimen Extra-comunitario"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
-msgstr "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
+msgstr ""
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
@@ -187,11 +182,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr "¡Error! No puedes crear plantillas de cuentas recursivas."
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -210,13 +200,9 @@ msgid "Select Fiscal Year"
 msgstr "Seleccionar el año fiscal"
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr "¡Error! No puede crear códigos de impuesto recursivos."
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -238,8 +224,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -269,11 +256,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr "Socio dentro del IVA"
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -327,6 +309,11 @@ msgstr "Cantidad límite"
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr "Régimen Extra-comunitario"
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -393,17 +380,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr "El archivo XML ha sido Creado."
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -472,16 +448,9 @@ msgid "Periodical VAT Declaration"
 msgstr "Periodo de delcaración de IVA"
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
-msgstr ""
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
+msgstr "Vue"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,ask_payment:0
@@ -533,6 +502,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
@@ -593,3 +567,9 @@ msgstr ""
 #~ "Esto es el mismo mago que corre de la Gestión "
 #~ "financiera/configuración/Contabilidad financiera/Consideración "
 #~ "Financiera/Genera el Plan contable de una Plantilla de Carta."
+
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "¡Error! No puedes crear plantillas de cuentas recursivas."
+
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "¡Error! No puede crear códigos de impuesto recursivos."
diff --git a/addons/l10n_be/i18n/es_AR.po b/addons/l10n_be/i18n/es_AR.po
index 5475dfdc25b..32cd7625212 100644
--- a/addons/l10n_be/i18n/es_AR.po
+++ b/addons/l10n_be/i18n/es_AR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-04 12:18+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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,9 +126,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/et.po b/addons/l10n_be/i18n/et.po
index 63d1eaa8e9d..48e6b4728be 100644
--- a/addons/l10n_be/i18n/et.po
+++ b/addons/l10n_be/i18n/et.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-09 17:47+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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,10 +126,9 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
-msgstr ""
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
+msgstr "XML fail on loodud."
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_financiers
@@ -158,14 +152,15 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
-msgstr "Vaade"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
+msgstr ""
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr "Viga ! Sa ei saa luua rekrusiivseid kontomalle."
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr "Vali fiskaalaasta"
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr "Viga ! sa ei saa luua rekrusiivseid maksukoode."
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr "XML fail on loodud."
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,16 +447,9 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
-msgstr ""
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
+msgstr "Vaade"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,ask_payment:0
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
@@ -547,6 +521,12 @@ msgstr ""
 #~ msgid "Notification"
 #~ msgstr "Teavitus"
 
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "Viga ! Sa ei saa luua rekrusiivseid kontomalle."
+
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "Viga ! sa ei saa luua rekrusiivseid maksukoode."
+
 #~ msgid "Select Period"
 #~ msgstr "Vali periood"
 
diff --git a/addons/l10n_be/i18n/fr.po b/addons/l10n_be/i18n/fr.po
index 7745141716b..27e9c722402 100644
--- a/addons/l10n_be/i18n/fr.po
+++ b/addons/l10n_be/i18n/fr.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-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/hr.po b/addons/l10n_be/i18n/hr.po
index 7fbd22a27aa..a0edcd01080 100644
--- a/addons/l10n_be/i18n/hr.po
+++ b/addons/l10n_be/i18n/hr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 15:02+0000\n"
 "Last-Translator: Miro Glavić <glavicmiro@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-10-31 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,10 +126,9 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
-msgstr ""
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
+msgstr "XML Datoteka je Kreirana."
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_financiers
@@ -158,14 +152,15 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
-msgstr "Pogled"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
+msgstr ""
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr "Greška ! Ne možete kreirati rekurzivne predloške računa."
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr "Odaberi Fiskalnu Godinu"
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr "Greška ! Ne možete kreirati rekurzivne Porezne Kodove."
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr "Ograniči Iznos"
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr "XML Datoteka je Kreirana."
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,16 +447,9 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
-msgstr ""
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
+msgstr "Pogled"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,ask_payment:0
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
@@ -547,9 +521,15 @@ msgstr ""
 #~ msgid "Notification"
 #~ msgstr "Obavijest"
 
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "Greška ! Ne možete kreirati rekurzivne predloške računa."
+
 #~ msgid "Select Period"
 #~ msgstr "Odaberite Period"
 
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "Greška ! Ne možete kreirati rekurzivne Porezne Kodove."
+
 #~ msgid "XML Flie has been Created."
 #~ msgstr "XML Datoteka je Kreirana."
 
diff --git a/addons/l10n_be/i18n/hu.po b/addons/l10n_be/i18n/hu.po
index 3aaa4618e51..bedd36f811c 100644
--- a/addons/l10n_be/i18n/hu.po
+++ b/addons/l10n_be/i18n/hu.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,9 +126,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/id.po b/addons/l10n_be/i18n/id.po
index a342ed26f65..f5f38cbbff6 100644
--- a/addons/l10n_be/i18n/id.po
+++ b/addons/l10n_be/i18n/id.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-09 13:51+0000\n"
 "Last-Translator: <>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,9 +126,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/it.po b/addons/l10n_be/i18n/it.po
index c8f73a8655b..d1458c782f9 100644
--- a/addons/l10n_be/i18n/it.po
+++ b/addons/l10n_be/i18n/it.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-09 17:47+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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,9 +126,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/ko.po b/addons/l10n_be/i18n/ko.po
index f20e0623ca5..dab24227768 100644
--- a/addons/l10n_be/i18n/ko.po
+++ b/addons/l10n_be/i18n/ko.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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-07-03 08:41+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -33,11 +33,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -132,9 +127,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -159,13 +153,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -187,11 +182,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -210,13 +200,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -238,8 +224,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -269,11 +256,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -327,6 +309,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -393,17 +380,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -472,15 +448,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -533,6 +502,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
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/i18n/lt.po b/addons/l10n_be/i18n/lt.po
index 17e5a82513e..bedd36f811c 100644
--- a/addons/l10n_be/i18n/lt.po
+++ b/addons/l10n_be/i18n/lt.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,9 +126,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/nl.po b/addons/l10n_be/i18n/nl.po
index 0fcf39b5837..8fefeb76f6f 100644
--- a/addons/l10n_be/i18n/nl.po
+++ b/addons/l10n_be/i18n/nl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-31 08:17+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-11-01 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr "Belastingcode"
 msgid "Régime Intra-Communautaire"
 msgstr "Intracommunautair"
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de actie definitie"
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -142,11 +137,9 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr "Geen BTW number bepaalt voor het Hoofd Bedrijf!"
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
-msgstr ""
-"Selecteer hier de periode(s) die U wilt opnemen in uw intracom. aangifte"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
+msgstr "XML bestand is aangemaakt"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_financiers
@@ -170,14 +163,15 @@ msgid "Régime National"
 msgstr "Nationaal Regime"
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
-msgstr "Extracommunautair"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
-msgstr "Weergave"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
+msgstr "Dit zet de XML output als test file"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
@@ -199,11 +193,6 @@ msgstr ""
 msgid "Save"
 msgstr "Opslaan"
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr "Fout ! U kunt geen herhalende sjablonen voor rekeningen maken"
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -222,14 +211,11 @@ msgid "Select Fiscal Year"
 msgstr "Selecteer Boekjaar"
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr "Fout! U kunt geen herhalende belastingcodes maken"
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
-msgstr "Periode Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
+msgstr ""
+"Selecteer hier de periode(s) die U wilt opnemen in uw intracom. aangifte"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_tiers
@@ -252,9 +238,10 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
+msgstr "Klanten"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
@@ -283,11 +270,6 @@ msgstr "Maak een XML file voor Intra. BTW aangifte"
 msgid "Partner VAT intra"
 msgstr "BTW Intra"
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fout ! U kan geen herhalend Menu maken"
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -341,6 +323,11 @@ msgstr "Bestedingslimiet"
 msgid "Companies"
 msgstr "Bedrijven"
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr "Extracommunautair"
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -407,18 +394,6 @@ msgstr "Periode(s)"
 msgid "Client Name"
 msgstr "Klant Naam"
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"De Object naam moet beginnen met X_ en mag geen speciale karakters bevatten !"
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr "XML bestand is aangemaakt"
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -487,16 +462,9 @@ msgid "Periodical VAT Declaration"
 msgstr "Periodieke BTW-aangifte"
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr "Dit zet de XML output als test file"
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
-msgstr "Klanten"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
+msgstr "Weergave"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,ask_payment:0
@@ -548,6 +516,11 @@ msgstr "Relatie.BTW"
 msgid "File Name"
 msgstr "Bestandsnaam"
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr "Periode Code"
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
@@ -587,3 +560,20 @@ msgstr "Het geeft aan of een betaling is uitgevoerd of niet?"
 #~ "Dit is dezelfde wizard die wekt  vanuit Financieel Management / Configuratie "
 #~ "/ Financial Accounting / Financiële Rekeningen / Genereer Rekeningsschema  "
 #~ "uit een schema sjabloon."
+
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "Fout ! U kunt geen herhalende sjablonen voor rekeningen maken"
+
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "Fout! U kunt geen herhalende belastingcodes maken"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fout ! U kan geen herhalend Menu maken"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "De Object naam moet beginnen met X_ en mag geen speciale karakters bevatten !"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ongeldige modelnaam in de actie definitie"
diff --git a/addons/l10n_be/i18n/nl_BE.po b/addons/l10n_be/i18n/nl_BE.po
index 3f5ab1d89bf..c455b4bd0b7 100644
--- a/addons/l10n_be/i18n/nl_BE.po
+++ b/addons/l10n_be/i18n/nl_BE.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 14:48+0000\n"
 "Last-Translator: Niels Huylebroeck <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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,10 +126,9 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
-msgstr ""
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
+msgstr "XML bestand is aangemaakt"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_financiers
@@ -158,14 +152,15 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
-msgstr "Weergave"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
+msgstr ""
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr "Selecteer Fiscaaljaar"
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr "Bestedingslimiet"
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr "XML bestand is aangemaakt"
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,16 +447,9 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
-msgstr ""
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
+msgstr "Weergave"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,ask_payment:0
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/pl.po b/addons/l10n_be/i18n/pl.po
index 17e5a82513e..bedd36f811c 100644
--- a/addons/l10n_be/i18n/pl.po
+++ b/addons/l10n_be/i18n/pl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,9 +126,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/pt.po b/addons/l10n_be/i18n/pt.po
index b9b264e0b89..304088cc8c1 100644
--- a/addons/l10n_be/i18n/pt.po
+++ b/addons/l10n_be/i18n/pt.po
@@ -6,20 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-09 17:48+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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_tiers_receiv
 msgid "Tiers - Recevable"
-msgstr ""
+msgstr "Nível - Aceitável"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,tax_code_id:0
@@ -30,18 +30,13 @@ msgstr ""
 #. module: l10n_be
 #: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_3
 msgid "Régime Intra-Communautaire"
-msgstr ""
-
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Regime Intra-Comunitário"
 
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
 msgid "Partner VAT Intra"
-msgstr ""
+msgstr "IVA de Terceiro Intra-Comunitário"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:0
@@ -52,7 +47,7 @@ msgstr ""
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_immo
 msgid "Immobilisation"
-msgstr ""
+msgstr "Imobilização"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
@@ -63,7 +58,7 @@ msgstr ""
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_tiers_payable
 msgid "Tiers - Payable"
-msgstr ""
+msgstr "Níveis - Pagável"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
@@ -120,7 +115,7 @@ msgstr ""
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_tax
 msgid "Tax"
-msgstr ""
+msgstr "Imposto"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
@@ -128,18 +123,17 @@ msgstr ""
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
 #, python-format
 msgid "No VAT Number Associated with Main Company!"
-msgstr ""
+msgstr "Nenhum Número IVA Associado com a Empresa Principal"
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
-msgstr ""
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
+msgstr "O Ficheiro XML foi Criado."
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_financiers
 msgid "Financier"
-msgstr ""
+msgstr "Financiador"
 
 #. module: l10n_be
 #: view:partner.vat:0
@@ -155,16 +149,17 @@ msgstr ""
 #. module: l10n_be
 #: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_1
 msgid "Régime National"
+msgstr "Regime Nacional"
+
+#. module: l10n_be
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -172,7 +167,7 @@ msgstr ""
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
 #, python-format
 msgid "Data Insufficient!"
-msgstr ""
+msgstr "Dado Insuficiente!"
 
 #. module: l10n_be
 #: help:partner.vat.list,partner_ids:0
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -201,27 +191,23 @@ msgstr "Informação Geral"
 #: field:partner.vat.intra,file_save:0
 #: field:partner.vat.list,file_save:0
 msgid "Save File"
-msgstr ""
+msgstr "Guardar Ficheiro"
 
 #. module: l10n_be
 #: view:partner.vat.list:0
 msgid "Select Fiscal Year"
-msgstr ""
+msgstr "Seleccione o Ano Fiscal"
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_tiers
 msgid "Tiers"
-msgstr ""
+msgstr "Níveis"
 
 #. module: l10n_be
 #: view:partner.vat.list:0
@@ -237,15 +223,16 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
 #: field:partner.vat.intra,test_xml:0
 msgid "Test XML file"
-msgstr ""
+msgstr "Testar ficheiro XML"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
@@ -266,19 +253,14 @@ msgstr ""
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "Partner VAT intra"
-msgstr ""
-
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "IVA de Terceiro Intra-Comunitário"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
 #: field:partner.vat.list,msg:0
 msgid "File created"
-msgstr ""
+msgstr "Ficheiro criado"
 
 #. module: l10n_be
 #: help:l1on_be.vat.declaration,ask_resitution:0
@@ -314,18 +296,23 @@ msgstr ""
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_produit
 msgid "Produit"
-msgstr ""
+msgstr "Produto"
 
 #. module: l10n_be
 #: field:partner.vat,limit_amount:0
 msgid "Limit Amount"
-msgstr ""
+msgstr "Montante Limite"
 
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_res_company
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr "Regime Extra-Comunitário"
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -335,7 +322,7 @@ msgstr ""
 #: field:partner.vat,mand_id:0
 #: field:partner.vat.intra,mand_id:0
 msgid "MandataireId"
-msgstr ""
+msgstr "Mandatado"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -346,7 +333,7 @@ msgstr ""
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Período"
 
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_l1on_be_vat_declaration
@@ -373,7 +360,7 @@ msgstr ""
 #. module: l10n_be
 #: view:partner.vat:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
@@ -392,40 +379,29 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
 #, python-format
 msgid "No partner has a VAT Number asociated with him."
-msgstr ""
+msgstr "Nenhum terceiro tem um Número IVA associado com ele."
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_charge
 msgid "Charge"
-msgstr ""
+msgstr "Carga"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
 #: view:partner.vat.intra:0
 #: view:partner.vat.list:0
 msgid "Create XML"
-msgstr ""
+msgstr "Criar XML"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_capitaux
 msgid "Capital"
-msgstr ""
+msgstr "Capital"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
@@ -436,7 +412,7 @@ msgstr ""
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -447,7 +423,7 @@ msgstr ""
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_stock
 msgid "Stock et Encours"
-msgstr ""
+msgstr "Stock Excelente"
 
 #. module: l10n_be
 #: model:ir.ui.menu,name:l10n_be.partner_vat_listing
@@ -457,7 +433,7 @@ msgstr ""
 #. module: l10n_be
 #: model:ir.module.module,shortdesc:l10n_be.module_meta_information
 msgid "Belgium - Plan Comptable Minimum Normalise"
-msgstr ""
+msgstr "Bélgica - Plano Contabilístico Mínimo Normalizado"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
@@ -468,18 +444,11 @@ msgstr ""
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_declaration
 #: view:l1on_be.vat.declaration:0
 msgid "Periodical VAT Declaration"
-msgstr ""
+msgstr "Declaração Periodica de IVA"
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -495,7 +464,7 @@ msgstr ""
 #. module: l10n_be
 #: field:partner.vat,fyear:0
 msgid "Fiscal Year"
-msgstr ""
+msgstr "Ano Fiscal"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,client_nihil:0
@@ -508,12 +477,12 @@ msgstr ""
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
 #, python-format
 msgid "Data Insufficient"
-msgstr ""
+msgstr "Dado Insuficiente"
 
 #. module: l10n_be
 #: model:ir.ui.menu,name:l10n_be.menu_finance_belgian_statement
 msgid "Belgium Statements"
-msgstr ""
+msgstr "Declarações da Bélgica"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
@@ -532,12 +501,19 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
 "This wizard will create an XML file for Vat details and total invoiced "
 "amounts per partner."
 msgstr ""
+"O assistente vai criar um ficheiro XML para detalhes IVA e total de "
+"montantes facturados por terceiro."
 
 #. module: l10n_be
 #: help:l1on_be.vat.declaration,ask_payment:0
diff --git a/addons/l10n_be/i18n/pt_BR.po b/addons/l10n_be/i18n/pt_BR.po
index a8d65dd3768..d651fae3d7d 100644
--- a/addons/l10n_be/i18n/pt_BR.po
+++ b/addons/l10n_be/i18n/pt_BR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-01-30 13:23+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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,9 +126,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/ro.po b/addons/l10n_be/i18n/ro.po
index 17e5a82513e..bedd36f811c 100644
--- a/addons/l10n_be/i18n/ro.po
+++ b/addons/l10n_be/i18n/ro.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,9 +126,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/ru.po b/addons/l10n_be/i18n/ru.po
index 346ba5882f1..c843fba038d 100644
--- a/addons/l10n_be/i18n/ru.po
+++ b/addons/l10n_be/i18n/ru.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 06:52+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,10 +126,9 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
-msgstr ""
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
+msgstr "XML файл был создан."
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_financiers
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr "XML файл был создан."
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/sl.po b/addons/l10n_be/i18n/sl.po
index ffec5e39165..dd34a21eeb0 100644
--- a/addons/l10n_be/i18n/sl.po
+++ b/addons/l10n_be/i18n/sl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 15:33+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-10-31 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,10 +126,9 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
-msgstr ""
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
+msgstr "Datoteka XML je bila izdelana."
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_financiers
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr "Napaka! Ne morete oblikovati rekurzivnih predlog kontov."
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr "Izberi davčno leto"
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr "Napaka! Ne morete oblikovati rekurzivnih davčnih oznak."
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr "Datoteka XML je bila izdelana."
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
@@ -553,6 +527,12 @@ msgstr ""
 #~ msgid "Apr/May/Jun"
 #~ msgstr "Apr/Maj/Jun"
 
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "Napaka! Ne morete oblikovati rekurzivnih predlog kontov."
+
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "Napaka! Ne morete oblikovati rekurzivnih davčnih oznak."
+
 #~ msgid "Jan/Feb/Mar"
 #~ msgstr "Jan/Feb/Mar"
 
diff --git a/addons/l10n_be/i18n/sq.po b/addons/l10n_be/i18n/sq.po
index bcb95c031a8..95ccae0fef0 100644
--- a/addons/l10n_be/i18n/sq.po
+++ b/addons/l10n_be/i18n/sq.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -33,11 +33,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -132,9 +127,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -159,13 +153,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -187,11 +182,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -210,13 +200,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -238,8 +224,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -269,11 +256,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -327,6 +309,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -393,17 +380,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -472,15 +448,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -533,6 +502,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/sr@latin.po b/addons/l10n_be/i18n/sr@latin.po
index 535a8d5eac1..623033710fd 100644
--- a/addons/l10n_be/i18n/sr@latin.po
+++ b/addons/l10n_be/i18n/sr@latin.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-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/sv.po b/addons/l10n_be/i18n/sv.po
index f48808a1d3b..9c66f0de306 100644
--- a/addons/l10n_be/i18n/sv.po
+++ b/addons/l10n_be/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-23 09:31+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-11-24 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,9 +126,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -158,18 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -191,16 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -219,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -247,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -278,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -336,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,11 +369,6 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#. module: l10n_be
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: l10n_be
 #: field:partner.vat.intra,period_ids:0
 msgid "Period (s)"
@@ -407,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -486,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -547,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/tlh.po b/addons/l10n_be/i18n/tlh.po
index 019e128fcb5..0ce57abd9e1 100644
--- a/addons/l10n_be/i18n/tlh.po
+++ b/addons/l10n_be/i18n/tlh.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,9 +126,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/tr.po b/addons/l10n_be/i18n/tr.po
index 4e82780e491..2db86526382 100644
--- a/addons/l10n_be/i18n/tr.po
+++ b/addons/l10n_be/i18n/tr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-09 07:17+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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,9 +126,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/uk.po b/addons/l10n_be/i18n/uk.po
index 333294ca1d7..866bf9e90ac 100644
--- a/addons/l10n_be/i18n/uk.po
+++ b/addons/l10n_be/i18n/uk.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2008-09-26 15:13+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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,9 +126,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/vi.po b/addons/l10n_be/i18n/vi.po
index 1d57778d758..dc0f014ce2d 100644
--- a/addons/l10n_be/i18n/vi.po
+++ b/addons/l10n_be/i18n/vi.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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -33,11 +33,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -132,9 +127,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -159,13 +153,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -187,11 +182,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -210,13 +200,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -238,8 +224,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -269,11 +256,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -327,6 +309,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -393,17 +380,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -472,15 +448,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -533,6 +502,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/zh_CN.po b/addons/l10n_be/i18n/zh_CN.po
index 9eef47b6231..184ca00c3e8 100644
--- a/addons/l10n_be/i18n/zh_CN.po
+++ b/addons/l10n_be/i18n/zh_CN.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-01-30 13:23+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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,9 +126,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
diff --git a/addons/l10n_be/i18n/zh_TW.po b/addons/l10n_be/i18n/zh_TW.po
index c612d26f6ed..797180e39cc 100644
--- a/addons/l10n_be/i18n/zh_TW.po
+++ b/addons/l10n_be/i18n/zh_TW.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-01-30 13:16+0000\n"
 "Last-Translator: <>\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-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -32,11 +32,6 @@ msgstr ""
 msgid "Régime Intra-Communautaire"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
@@ -131,9 +126,8 @@ msgid "No VAT Number Associated with Main Company!"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid ""
-"Select here the period(s) you want to include in your intracom declaration"
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
 msgstr ""
 
 #. module: l10n_be
@@ -158,13 +152,14 @@ msgid "Régime National"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
 msgstr ""
 
 #. module: l10n_be
@@ -186,11 +181,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
@@ -209,13 +199,9 @@ msgid "Select Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -237,8 +223,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_be
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
 msgstr ""
 
 #. module: l10n_be
@@ -268,11 +255,6 @@ msgstr ""
 msgid "Partner VAT intra"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
 #: field:partner.vat.intra,msg:0
@@ -326,6 +308,11 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
@@ -392,17 +379,6 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#. module: l10n_be
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
-msgstr ""
-
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
@@ -471,15 +447,8 @@ msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
 msgstr ""
 
 #. module: l10n_be
@@ -532,6 +501,11 @@ msgstr ""
 msgid "File Name"
 msgstr ""
 
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
 #. module: l10n_be
 #: view:partner.vat:0
 msgid ""
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/i18n/ar.po b/addons/l10n_ch/i18n/ar.po
index a5b149ef719..c70e72dc86e 100644
--- a/addons/l10n_ch/i18n/ar.po
+++ b/addons/l10n_ch/i18n/ar.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/bg.po b/addons/l10n_ch/i18n/bg.po
index 4444665ea4e..0141e8db6b4 100644
--- a/addons/l10n_ch/i18n/bg.po
+++ b/addons/l10n_ch/i18n/bg.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/bs.po b/addons/l10n_ch/i18n/bs.po
index 392898058b9..c6c83d664e3 100644
--- a/addons/l10n_ch/i18n/bs.po
+++ b/addons/l10n_ch/i18n/bs.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/ca.po b/addons/l10n_ch/i18n/ca.po
index f7e3c69d4ba..f743e724798 100644
--- a/addons/l10n_ch/i18n/ca.po
+++ b/addons/l10n_ch/i18n/ca.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-12 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/cs.po b/addons/l10n_ch/i18n/cs.po
index 14851ea2af2..b8e53467f12 100644
--- a/addons/l10n_ch/i18n/cs.po
+++ b/addons/l10n_ch/i18n/cs.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/de.po b/addons/l10n_ch/i18n/de.po
index 41b8a784e4e..7dc9344146f 100644
--- a/addons/l10n_ch/i18n/de.po
+++ b/addons/l10n_ch/i18n/de.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-12 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/es.po b/addons/l10n_ch/i18n/es.po
index c0a3f74d97a..60b62f02016 100644
--- a/addons/l10n_ch/i18n/es.po
+++ b/addons/l10n_ch/i18n/es.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/es_AR.po b/addons/l10n_ch/i18n/es_AR.po
index 3a105f4caf5..a16c8b56671 100644
--- a/addons/l10n_ch/i18n/es_AR.po
+++ b/addons/l10n_ch/i18n/es_AR.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/et.po b/addons/l10n_ch/i18n/et.po
index 88f0fcbedbf..f88b99fdd17 100644
--- a/addons/l10n_ch/i18n/et.po
+++ b/addons/l10n_ch/i18n/et.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/fr.po b/addons/l10n_ch/i18n/fr.po
index 5983785c8b7..8c9b4014c1a 100644
--- a/addons/l10n_ch/i18n/fr.po
+++ b/addons/l10n_ch/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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/hr.po b/addons/l10n_ch/i18n/hr.po
index a5b149ef719..c70e72dc86e 100644
--- a/addons/l10n_ch/i18n/hr.po
+++ b/addons/l10n_ch/i18n/hr.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/hu.po b/addons/l10n_ch/i18n/hu.po
index a5b149ef719..c70e72dc86e 100644
--- a/addons/l10n_ch/i18n/hu.po
+++ b/addons/l10n_ch/i18n/hu.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/id.po b/addons/l10n_ch/i18n/id.po
index 77829ceec81..6e11451e75c 100644
--- a/addons/l10n_ch/i18n/id.po
+++ b/addons/l10n_ch/i18n/id.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/it.po b/addons/l10n_ch/i18n/it.po
index 204a95206b6..7efb599c847 100644
--- a/addons/l10n_ch/i18n/it.po
+++ b/addons/l10n_ch/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-12 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/ko.po b/addons/l10n_ch/i18n/ko.po
index 6845b277310..e027b3dcde1 100644
--- a/addons/l10n_ch/i18n/ko.po
+++ b/addons/l10n_ch/i18n/ko.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-12 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/lt.po b/addons/l10n_ch/i18n/lt.po
index a5b149ef719..c70e72dc86e 100644
--- a/addons/l10n_ch/i18n/lt.po
+++ b/addons/l10n_ch/i18n/lt.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/nl.po b/addons/l10n_ch/i18n/nl.po
index 17615ffdc03..01a7f7bd88f 100644
--- a/addons/l10n_ch/i18n/nl.po
+++ b/addons/l10n_ch/i18n/nl.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-12 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/nl_BE.po b/addons/l10n_ch/i18n/nl_BE.po
index 61ccc529d6b..9557201d2d8 100644
--- a/addons/l10n_ch/i18n/nl_BE.po
+++ b/addons/l10n_ch/i18n/nl_BE.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/pl.po b/addons/l10n_ch/i18n/pl.po
index e22d681b7ff..8141e35ae46 100644
--- a/addons/l10n_ch/i18n/pl.po
+++ b/addons/l10n_ch/i18n/pl.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/pt.po b/addons/l10n_ch/i18n/pt.po
index 1c37b2f517a..3d72920f269 100644
--- a/addons/l10n_ch/i18n/pt.po
+++ b/addons/l10n_ch/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-12 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/pt_BR.po b/addons/l10n_ch/i18n/pt_BR.po
index 864363d5962..4eb930ec05f 100644
--- a/addons/l10n_ch/i18n/pt_BR.po
+++ b/addons/l10n_ch/i18n/pt_BR.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-12 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/ro.po b/addons/l10n_ch/i18n/ro.po
index a5b149ef719..c70e72dc86e 100644
--- a/addons/l10n_ch/i18n/ro.po
+++ b/addons/l10n_ch/i18n/ro.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/ru.po b/addons/l10n_ch/i18n/ru.po
index cf55b22ac3f..525fa93b1a3 100644
--- a/addons/l10n_ch/i18n/ru.po
+++ b/addons/l10n_ch/i18n/ru.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/sl.po b/addons/l10n_ch/i18n/sl.po
index ea1fb10911a..4a1cd394910 100644
--- a/addons/l10n_ch/i18n/sl.po
+++ b/addons/l10n_ch/i18n/sl.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-12 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/sq.po b/addons/l10n_ch/i18n/sq.po
index d0f848a8715..e2abee8a0df 100644
--- a/addons/l10n_ch/i18n/sq.po
+++ b/addons/l10n_ch/i18n/sq.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/sr@latin.po b/addons/l10n_ch/i18n/sr@latin.po
index 97c7cd7daeb..e9004166d86 100644
--- a/addons/l10n_ch/i18n/sr@latin.po
+++ b/addons/l10n_ch/i18n/sr@latin.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/sv.po b/addons/l10n_ch/i18n/sv.po
index c3266e40433..52eab84a61a 100644
--- a/addons/l10n_ch/i18n/sv.po
+++ b/addons/l10n_ch/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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/tr.po b/addons/l10n_ch/i18n/tr.po
index 408aca89d00..fb60a9fbcad 100644
--- a/addons/l10n_ch/i18n/tr.po
+++ b/addons/l10n_ch/i18n/tr.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/uk.po b/addons/l10n_ch/i18n/uk.po
index dc214a8ad42..a22c7148302 100644
--- a/addons/l10n_ch/i18n/uk.po
+++ b/addons/l10n_ch/i18n/uk.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/vi.po b/addons/l10n_ch/i18n/vi.po
index 1e27b20176e..8f585241d10 100644
--- a/addons/l10n_ch/i18n/vi.po
+++ b/addons/l10n_ch/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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/zh_CN.po b/addons/l10n_ch/i18n/zh_CN.po
index daa874a30b4..44f04b47f09 100644
--- a/addons/l10n_ch/i18n/zh_CN.po
+++ b/addons/l10n_ch/i18n/zh_CN.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/zh_TW.po b/addons/l10n_ch/i18n/zh_TW.po
index a5b149ef719..c70e72dc86e 100644
--- a/addons/l10n_ch/i18n/zh_TW.po
+++ b/addons/l10n_ch/i18n/zh_TW.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
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/ca.po b/addons/l10n_es/i18n/ca.po
index 77cd0a796c5..88bb6f96c35 100644
--- a/addons/l10n_es/i18n/ca.po
+++ b/addons/l10n_es/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-23 08:58+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-15 12:17+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,18 +14,106 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-16 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_es
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr "Error! No podeu crear plantilles de comptes recursius."
+#: model:account.fiscal.position.template,name:l10n_es.fp_extra
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_extra
+msgid "Régimen Extracomunitario"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_irpf15
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf15
+msgid "Retención IRPF 15%"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.stock
+msgid "Existencias"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_recargo
+#: model:account.fiscal.position.template,name:l10n_es.fp_recargo
+msgid "Recargo de Equivalencia"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.terceros - rec
+msgid "Terceros - A Cobrar"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.terceros
+msgid "Terceros"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_irpf1
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf1
+msgid "Retención IRPF 1%"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.terceros - pay
+msgid "Terceros - A Pagar"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.tax
+msgid "Impuestos"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_irpf7
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf7
+msgid "Retención IRPF 7%"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_nacional
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_nacional
+msgid "Régimen Nacional"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.inmo
+msgid "Inmobilizado"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_irpf18
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf18
+msgid "Retención IRPF 18%"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.ingresos
+msgid "Ingresos"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.view
+msgid "View"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_intra
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_intra
+msgid "Régimen Intracomunitario"
+msgstr ""
 
 #. module: l10n_es
 #: model:ir.module.module,description:l10n_es.module_meta_information
 msgid ""
-"Spanish General Chart of Accounts 2008\n"
+"Spanish Charts of Accounts (PGCE 2008)\n"
 "\n"
 "* Defines the following chart of account templates:\n"
 "        * Spanish General Chart of Accounts 2008.\n"
@@ -37,29 +125,72 @@ msgid ""
 "Note: You should install the l10n_ES_account_balance_report module\n"
 "for yearly account reporting (balance, profit & losses).\n"
 msgstr ""
-"Pla general comptable espanyol 2008\n"
-"* Defineix les plantilles dels plans comptables:\n"
-"        * Pla General Comptable Espanyol 2008.\n"
-"        * Pla General Comptable Espanyol PYMES 2008.\n"
-"* Defineix la plantilla dels impostos IVA suportat, IVA repercutit, "
-"recàrrecs d'equivalència, IRPF.\n"
-"* Defineix la plantilla de codis d'impostos.\n"
-"* Defineix la plantilla de posicions fiscals.\n"
-"\n"
-"Nota: Per a la impressió dels comptes anuals (balanç, pèrdues i guanys) \n"
-"es recomana instal·lar el mòdul l10n_ES_account_balance_report.\n"
-
-#. module: l10n_es
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr "Error! No podeu crear codis d'impostos recursius."
-
-#. module: l10n_es
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
 
 #. module: l10n_es
 #: model:ir.module.module,shortdesc:l10n_es.module_meta_information
-msgid "Spain - Chart of Accounts 2008"
-msgstr "Espanya - Pla Comptable 2008"
+msgid "Spanish Charts of Accounts (PGCE 2008)"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.financieras
+msgid "Financieras"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_irpf19
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf19
+msgid "Retención IRPF 19%"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_irpf2
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf2
+msgid "Retención IRPF 2%"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.gastos
+msgid "Gastos"
+msgstr ""
+
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "Error! No podeu crear plantilles de comptes recursius."
+
+#~ msgid ""
+#~ "Spanish General Chart of Accounts 2008\n"
+#~ "\n"
+#~ "* Defines the following chart of account templates:\n"
+#~ "        * Spanish General Chart of Accounts 2008.\n"
+#~ "        * Spanish General Chart of Accounts 2008 for small and medium "
+#~ "companies.\n"
+#~ "* Defines templates for sale and purchase VAT.\n"
+#~ "* Defines tax code templates.\n"
+#~ "\n"
+#~ "Note: You should install the l10n_ES_account_balance_report module\n"
+#~ "for yearly account reporting (balance, profit & losses).\n"
+#~ msgstr ""
+#~ "Pla general comptable espanyol 2008\n"
+#~ "* Defineix les plantilles dels plans comptables:\n"
+#~ "        * Pla General Comptable Espanyol 2008.\n"
+#~ "        * Pla General Comptable Espanyol PYMES 2008.\n"
+#~ "* Defineix la plantilla dels impostos IVA suportat, IVA repercutit, "
+#~ "recàrrecs d'equivalència, IRPF.\n"
+#~ "* Defineix la plantilla de codis d'impostos.\n"
+#~ "* Defineix la plantilla de posicions fiscals.\n"
+#~ "\n"
+#~ "Nota: Per a la impressió dels comptes anuals (balanç, pèrdues i guanys) \n"
+#~ "es recomana instal·lar el mòdul l10n_ES_account_balance_report.\n"
+
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "Error! No podeu crear codis d'impostos recursius."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invàlid per a la definició de la vista!"
+
+#~ msgid "Spain - Chart of Accounts 2008"
+#~ msgstr "Espanya - Pla Comptable 2008"
diff --git a/addons/l10n_es/i18n/es.po b/addons/l10n_es/i18n/es.po
index e5720e0e82c..e48e12e18fb 100644
--- a/addons/l10n_es/i18n/es.po
+++ b/addons/l10n_es/i18n/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-23 08:58+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-15 12:26+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,18 +14,106 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-16 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_es
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr "¡Error! No puede crear plantillas de cuentas recursivas."
+#: model:account.fiscal.position.template,name:l10n_es.fp_extra
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_extra
+msgid "Régimen Extracomunitario"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_irpf15
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf15
+msgid "Retención IRPF 15%"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.stock
+msgid "Existencias"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_recargo
+#: model:account.fiscal.position.template,name:l10n_es.fp_recargo
+msgid "Recargo de Equivalencia"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.terceros - rec
+msgid "Terceros - A Cobrar"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.terceros
+msgid "Terceros"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_irpf1
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf1
+msgid "Retención IRPF 1%"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.terceros - pay
+msgid "Terceros - A Pagar"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.tax
+msgid "Impuestos"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_irpf7
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf7
+msgid "Retención IRPF 7%"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_nacional
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_nacional
+msgid "Régimen Nacional"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.inmo
+msgid "Inmobilizado"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_irpf18
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf18
+msgid "Retención IRPF 18%"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.ingresos
+msgid "Ingresos"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.view
+msgid "View"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_intra
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_intra
+msgid "Régimen Intracomunitario"
+msgstr ""
 
 #. module: l10n_es
 #: model:ir.module.module,description:l10n_es.module_meta_information
 msgid ""
-"Spanish General Chart of Accounts 2008\n"
+"Spanish Charts of Accounts (PGCE 2008)\n"
 "\n"
 "* Defines the following chart of account templates:\n"
 "        * Spanish General Chart of Accounts 2008.\n"
@@ -37,29 +125,72 @@ msgid ""
 "Note: You should install the l10n_ES_account_balance_report module\n"
 "for yearly account reporting (balance, profit & losses).\n"
 msgstr ""
-"Plan general contable español 2008\n"
-"* Define las plantillas de los planes contables:\n"
-"        * Plan General Contable Español 2008.\n"
-"        * Plan General Contable Español PYMES 2008.\n"
-"* Define la plantilla de los impuestos IVA soportado, IVA repercutido, "
-"recargos de equivalencia, IRPF.\n"
-"* Define la plantilla de códigos de impuestos.\n"
-"* Define la plantilla de posiciones fiscales.\n"
-"\n"
-"Nota: Para la impresión de cuentas anuales (balance, pérdidas y ganancias) \n"
-"se recomienda instalar el módulo l10n_ES_account_balance_report.\n"
-
-#. module: l10n_es
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr "¡Error! No puede crear códigos de impuesto recursivos."
-
-#. module: l10n_es
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
 
 #. module: l10n_es
 #: model:ir.module.module,shortdesc:l10n_es.module_meta_information
-msgid "Spain - Chart of Accounts 2008"
-msgstr "España - Plan Contable 2008"
+msgid "Spanish Charts of Accounts (PGCE 2008)"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.financieras
+msgid "Financieras"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_irpf19
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf19
+msgid "Retención IRPF 19%"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_irpf2
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf2
+msgid "Retención IRPF 2%"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.gastos
+msgid "Gastos"
+msgstr ""
+
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "¡Error! No puede crear plantillas de cuentas recursivas."
+
+#~ msgid ""
+#~ "Spanish General Chart of Accounts 2008\n"
+#~ "\n"
+#~ "* Defines the following chart of account templates:\n"
+#~ "        * Spanish General Chart of Accounts 2008.\n"
+#~ "        * Spanish General Chart of Accounts 2008 for small and medium "
+#~ "companies.\n"
+#~ "* Defines templates for sale and purchase VAT.\n"
+#~ "* Defines tax code templates.\n"
+#~ "\n"
+#~ "Note: You should install the l10n_ES_account_balance_report module\n"
+#~ "for yearly account reporting (balance, profit & losses).\n"
+#~ msgstr ""
+#~ "Plan general contable español 2008\n"
+#~ "* Define las plantillas de los planes contables:\n"
+#~ "        * Plan General Contable Español 2008.\n"
+#~ "        * Plan General Contable Español PYMES 2008.\n"
+#~ "* Define la plantilla de los impuestos IVA soportado, IVA repercutido, "
+#~ "recargos de equivalencia, IRPF.\n"
+#~ "* Define la plantilla de códigos de impuestos.\n"
+#~ "* Define la plantilla de posiciones fiscales.\n"
+#~ "\n"
+#~ "Nota: Para la impresión de cuentas anuales (balance, pérdidas y ganancias) \n"
+#~ "se recomienda instalar el módulo l10n_ES_account_balance_report.\n"
+
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "¡Error! No puede crear códigos de impuesto recursivos."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Spain - Chart of Accounts 2008"
+#~ msgstr "España - Plan Contable 2008"
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_es/i18n/sr@latin.po b/addons/l10n_es/i18n/sr@latin.po
index f2488c7a665..9e5d24677f7 100644
--- a/addons/l10n_es/i18n/sr@latin.po
+++ b/addons/l10n_es/i18n/sr@latin.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-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_es
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 8150f0d6a53..e47503d1841 100644
--- a/addons/l10n_fr/i18n/fr.po
+++ b/addons/l10n_fr/i18n/fr.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:43+0000\n"
-"PO-Revision-Date: 2010-12-04 09:26+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\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-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
@@ -97,7 +96,7 @@ msgstr "À payer"
 #. module: l10n_fr
 #: view:account.cdr.report:0
 msgid "Compte de resultant"
-msgstr "Compte de resultant"
+msgstr "Compte de résultat"
 
 #. module: l10n_fr
 #: field:l10n.fr.line,report_id:0
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/el.po b/addons/l10n_gr/i18n/el.po
index f580e6323a1..fd0f6ace2c8 100644
--- a/addons/l10n_gr/i18n/el.po
+++ b/addons/l10n_gr/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-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_gr
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_gr/i18n/sr@latin.po b/addons/l10n_gr/i18n/sr@latin.po
index 6edf6d9b774..687510f2680 100644
--- a/addons/l10n_gr/i18n/sr@latin.po
+++ b/addons/l10n_gr/i18n/sr@latin.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-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_gr
diff --git a/addons/l10n_gt/i18n/es.po b/addons/l10n_gt/i18n/es.po
index 135b7f67f84..fd93c10795d 100644
--- a/addons/l10n_gt/i18n/es.po
+++ b/addons/l10n_gt/i18n/es.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-14 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_gt
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_gt/i18n/sr@latin.po b/addons/l10n_gt/i18n/sr@latin.po
index c254dc7b24d..23646495218 100644
--- a/addons/l10n_gt/i18n/sr@latin.po
+++ b/addons/l10n_gt/i18n/sr@latin.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-14 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_gt
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_in/i18n/sr@latin.po b/addons/l10n_in/i18n/sr@latin.po
index 180cdace7c2..83acc31efd0 100644
--- a/addons/l10n_in/i18n/sr@latin.po
+++ b/addons/l10n_in/i18n/sr@latin.po
@@ -7,36 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-11-25 15:28+0000\n"
-"PO-Revision-Date: 2010-12-10 18:06+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-10 18:21+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@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-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: l10n_chart_in
-#: model:ir.module.module,description:l10n_chart_in.module_meta_information
-msgid ""
-"\n"
-"    Indian Accounting : chart of Account\n"
-"    "
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_asset_view
+msgid "Asset View"
 msgstr ""
 
-#. module: l10n_chart_in
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_expense1
+msgid "Expense"
+msgstr "Trošak"
+
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_income_view
+msgid "Income View"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.journal,name:l10n_chart_in.opening_journal
-msgid "Opening Journal"
-msgstr "Otvaranje Dnevnika"
-
-#. module: l10n_chart_in
-#: model:ir.actions.todo,note:l10n_chart_in.config_call_account_template_in_minimal
+#. module: l10n_in
+#: model:ir.actions.todo,note:l10n_in.config_call_account_template_in_minimal
 msgid ""
 "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
 "the name of the company, the chart template to follow, the no. of digits to "
@@ -47,42 +44,42 @@ msgid ""
 "Chart of Accounts from a Chart Template."
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_liability1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_liability1
 msgid "Liability"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_asset1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_asset1
 msgid "Asset"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_closed1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_closed1
 msgid "Closed"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_income1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_income1
 msgid "Income"
 msgstr ""
 
-#. module: l10n_chart_in
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_liability_view
+msgid "Liability View"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_expense1
-msgid "Expense"
-msgstr ""
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_expense_view
+msgid "Expense View"
+msgstr "Pregled troškova"
 
-#. module: l10n_chart_in
-#: model:ir.module.module,shortdesc:l10n_chart_in.module_meta_information
+#. module: l10n_in
+#: model:ir.module.module,shortdesc:l10n_in.module_meta_information
 msgid "Indian Chart of Account"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_root_ind1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_root_ind1
 msgid "View"
-msgstr ""
+msgstr "Pregled"
diff --git a/addons/l10n_lu/i18n/ar.po b/addons/l10n_lu/i18n/ar.po
index 52231abc564..ba5a6228ed8 100644
--- a/addons/l10n_lu/i18n/ar.po
+++ b/addons/l10n_lu/i18n/ar.po
@@ -6,30 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
 msgstr ""
 
 #. module: l10n_lu
@@ -37,65 +47,46 @@ msgstr ""
 msgid "Luxembourg"
 msgstr ""
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr ""
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr ""
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
+#: view:vat.declaration.report:0
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_lu
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr ""
diff --git a/addons/l10n_lu/i18n/bg.po b/addons/l10n_lu/i18n/bg.po
index f2dc31b6756..3c03ad96951 100644
--- a/addons/l10n_lu/i18n/bg.po
+++ b/addons/l10n_lu/i18n/bg.po
@@ -6,98 +6,89 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-04-10 09:32+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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr "Акции"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "Приход"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
+msgstr "В брой"
 
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu
 msgid "Luxembourg"
 msgstr ""
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr ""
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr "Притежание"
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr "Приход"
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr ""
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr "Притежание"
+
+#. module: l10n_lu
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
+msgstr "Акции"
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:vat.declaration.report:0
+msgid "Cancel"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
-msgstr "В брой"
-
 #. module: l10n_lu
 #: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
 msgid "Luxembourg - Plan Comptable Minimum Normalise"
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr "Разход"
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr "Изглед"
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr "Изглед"
diff --git a/addons/l10n_lu/i18n/bs.po b/addons/l10n_lu/i18n/bs.po
index 1d6354a75a3..0fa2a2ad363 100644
--- a/addons/l10n_lu/i18n/bs.po
+++ b/addons/l10n_lu/i18n/bs.po
@@ -6,30 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
 msgstr ""
 
 #. module: l10n_lu
@@ -37,65 +47,46 @@ msgstr ""
 msgid "Luxembourg"
 msgstr ""
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr ""
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr ""
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
+#: view:vat.declaration.report:0
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_lu
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr ""
diff --git a/addons/l10n_lu/i18n/ca.po b/addons/l10n_lu/i18n/ca.po
index 22505bc507d..03c7ae8ee7b 100644
--- a/addons/l10n_lu/i18n/ca.po
+++ b/addons/l10n_lu/i18n/ca.po
@@ -6,66 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-04-10 09:32+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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr "Patrimoni"
-
-#. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu
-msgid "Luxembourg"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "pdf not created !"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr "Actiu"
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr "Ingrés"
-
 #. module: l10n_lu
 #: view:vat.declaration.report:0
 msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
@@ -74,8 +33,23 @@ msgid "Company"
 msgstr ""
 
 #. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
-msgid "VAT Declaration"
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "Ingrés"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
+msgstr "Caixa"
+
+#. module: l10n_lu
+#: model:ir.ui.menu,name:l10n_lu.legal_lu
+msgid "Luxembourg"
+msgstr ""
+
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
 msgstr ""
 
 #. module: l10n_lu
@@ -84,19 +58,36 @@ msgid "Liability"
 msgstr "Passiu"
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "pdf not created !"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
+msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
-msgstr "Caixa"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr "Actiu"
+
+#. module: l10n_lu
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
+msgstr "Patrimoni"
+
+#. module: l10n_lu
+#: view:vat.declaration.report:0
+msgid "Cancel"
+msgstr ""
 
 #. module: l10n_lu
 #: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr "Despesa"
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr "Vista"
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr "Vista"
diff --git a/addons/l10n_lu/i18n/cs.po b/addons/l10n_lu/i18n/cs.po
index 52231abc564..ba5a6228ed8 100644
--- a/addons/l10n_lu/i18n/cs.po
+++ b/addons/l10n_lu/i18n/cs.po
@@ -6,30 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
 msgstr ""
 
 #. module: l10n_lu
@@ -37,65 +47,46 @@ msgstr ""
 msgid "Luxembourg"
 msgstr ""
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr ""
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr ""
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
+#: view:vat.declaration.report:0
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_lu
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr ""
diff --git a/addons/l10n_lu/i18n/de.po b/addons/l10n_lu/i18n/de.po
index 0feff67e0de..d9f1a72370b 100644
--- a/addons/l10n_lu/i18n/de.po
+++ b/addons/l10n_lu/i18n/de.po
@@ -6,66 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-04-10 09:32+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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr "Eigenkapital"
-
-#. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu
-msgid "Luxembourg"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "pdf not created !"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr "Aktiva"
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr "Erlöse"
-
 #. module: l10n_lu
 #: view:vat.declaration.report:0
 msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
@@ -74,8 +33,23 @@ msgid "Company"
 msgstr ""
 
 #. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
-msgid "VAT Declaration"
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "Erlöse"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
+msgstr "Kasse/Bank"
+
+#. module: l10n_lu
+#: model:ir.ui.menu,name:l10n_lu.legal_lu
+msgid "Luxembourg"
+msgstr ""
+
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
 msgstr ""
 
 #. module: l10n_lu
@@ -84,19 +58,36 @@ msgid "Liability"
 msgstr "Verbindlichkeit"
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "pdf not created !"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
+msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
-msgstr "Kasse/Bank"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr "Aktiva"
+
+#. module: l10n_lu
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
+msgstr "Eigenkapital"
+
+#. module: l10n_lu
+#: view:vat.declaration.report:0
+msgid "Cancel"
+msgstr ""
 
 #. module: l10n_lu
 #: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr "Aufwand"
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr "Ansicht"
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr "Ansicht"
diff --git a/addons/l10n_lu/i18n/es.po b/addons/l10n_lu/i18n/es.po
index ec066619a04..9fa363a666e 100644
--- a/addons/l10n_lu/i18n/es.po
+++ b/addons/l10n_lu/i18n/es.po
@@ -6,97 +6,88 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-29 11:32+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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr "Patrimonio"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "Ingreso"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
+msgstr "Efectivo"
 
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr "Pasivo"
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr "Activo"
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr "Ingreso"
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr "Error ! Usted no puede crear plantillas de cuentas recursivas."
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr "Empresa"
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr "Declaración de IVA"
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
-msgstr "Pasivo"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr "Activo"
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr "¡Error! No puede crear códigos de impuesto recursivos."
-
-#. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
-msgstr "Efectivo"
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
+msgstr "Patrimonio"
+
+#. module: l10n_lu
+#: view:vat.declaration.report:0
+msgid "Cancel"
+msgstr "Cancelar"
 
 #. module: l10n_lu
 #: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
@@ -108,38 +99,16 @@ msgstr "Luxemburgo- Plan Contable Mínimo Normalizado"
 msgid "Expense"
 msgstr "Gasto"
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr "Vista"
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr "Período"
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr "Reclamaciones"
 
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr "Vista"
+
 #~ msgid ""
 #~ "Generate Chart of Accounts from a Chart Template. You will be asked to "
 #~ "select the company, the chart template, the no. of digits to generate the "
@@ -158,8 +127,14 @@ msgstr "Reclamaciones"
 #~ msgid "Print Taxes Statement"
 #~ msgstr "Imprimir Declaración de Impuestos"
 
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "Error ! Usted no puede crear plantillas de cuentas recursivas."
+
 #~ msgid "Luxembourg VAT Declaration"
 #~ msgstr "Declaración de IVA en Luxemburgo"
 
 #~ msgid "VAT Legal Declaration"
 #~ msgstr "Declaración legal de IVA"
+
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "¡Error! No puede crear códigos de impuesto recursivos."
diff --git a/addons/l10n_lu/i18n/es_AR.po b/addons/l10n_lu/i18n/es_AR.po
index 79c709c0b0c..b9e3a5602a2 100644
--- a/addons/l10n_lu/i18n/es_AR.po
+++ b/addons/l10n_lu/i18n/es_AR.po
@@ -6,66 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-08 13: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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu
-msgid "Luxembourg"
-msgstr "Luxemburgo"
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "pdf not created !"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr "Activos"
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr "Ingresos"
-
 #. module: l10n_lu
 #: view:vat.declaration.report:0
 msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
@@ -74,9 +33,24 @@ msgid "Company"
 msgstr "Empresa"
 
 #. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
-msgid "VAT Declaration"
-msgstr "Declaración de IVA"
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "Ingresos"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
+msgstr "Efectivo"
+
+#. module: l10n_lu
+#: model:ir.ui.menu,name:l10n_lu.legal_lu
+msgid "Luxembourg"
+msgstr "Luxemburgo"
+
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr "Período"
 
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_liability
@@ -84,19 +58,36 @@ msgid "Liability"
 msgstr "Pasivo"
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "pdf not created !"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
+msgid "VAT Declaration"
+msgstr "Declaración de IVA"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr "Activos"
+
+#. module: l10n_lu
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
-msgstr "Efectivo"
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
+msgstr ""
+
+#. module: l10n_lu
+#: view:vat.declaration.report:0
+msgid "Cancel"
+msgstr "Cancelar"
 
 #. module: l10n_lu
 #: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
@@ -108,38 +99,16 @@ msgstr ""
 msgid "Expense"
 msgstr "Egresos"
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr "Período"
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr "Obligación"
 
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr ""
+
 #~ msgid "VAT Legal Declaration"
 #~ msgstr "Declaración legal de IVA"
 
diff --git a/addons/l10n_lu/i18n/et.po b/addons/l10n_lu/i18n/et.po
index 87310d4c62b..fdebefa449a 100644
--- a/addons/l10n_lu/i18n/et.po
+++ b/addons/l10n_lu/i18n/et.po
@@ -6,97 +6,88 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-09 17:57+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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr "Omakapital"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr "Ettevõte"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "Tulu"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
+msgstr "Kassa"
 
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr "Periood"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr "Kohustus"
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr "Vara"
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr "Tulu"
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr "Viga ! Sa ei saa luua rekrusiivseid kontomalle."
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr "Ettevõte"
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr "Käibemaksudeklaratsioon"
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
-msgstr "Kohustus"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr "Vara"
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr "Viga ! sa ei saa luua rekrusiivseid maksukoode."
-
-#. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
-msgstr "Kassa"
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
+msgstr "Omakapital"
+
+#. module: l10n_lu
+#: view:vat.declaration.report:0
+msgid "Cancel"
+msgstr "Tühista"
 
 #. module: l10n_lu
 #: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
@@ -108,37 +99,21 @@ msgstr ""
 msgid "Expense"
 msgstr "Kulu"
 
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_creances
+msgid "Créances"
+msgstr "Créances"
+
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_root
 msgid "View"
 msgstr "Vaade"
 
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr "Periood"
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "Viga ! Sa ei saa luua rekrusiivseid kontomalle."
 
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr "Tühista"
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_creances
-msgid "Créances"
-msgstr "Créances"
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "Viga ! sa ei saa luua rekrusiivseid maksukoode."
 
 #~ msgid "Luxembourg VAT Declaration"
 #~ msgstr "Luksemburgi maksudeklaratsioon"
diff --git a/addons/l10n_lu/i18n/fr.po b/addons/l10n_lu/i18n/fr.po
index 9b56e76b6b4..5b90bc3c009 100644
--- a/addons/l10n_lu/i18n/fr.po
+++ b/addons/l10n_lu/i18n/fr.po
@@ -6,66 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-04-10 09:32+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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr "Capitaux propres"
-
-#. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu
-msgid "Luxembourg"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "pdf not created !"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr "Actifs"
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr "Produits"
-
 #. module: l10n_lu
 #: view:vat.declaration.report:0
 msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
@@ -74,9 +33,24 @@ msgid "Company"
 msgstr ""
 
 #. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
-msgid "VAT Declaration"
-msgstr "Déclaration TVA"
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "Produits"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
+msgstr "Liquidités"
+
+#. module: l10n_lu
+#: model:ir.ui.menu,name:l10n_lu.legal_lu
+msgid "Luxembourg"
+msgstr ""
+
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr ""
 
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_liability
@@ -84,19 +58,36 @@ msgid "Liability"
 msgstr "Passif"
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr "Erreur ! Vous ne pouvez pas créer de codes de taxe récursifs"
-
-#. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "pdf not created !"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
-msgstr "Liquidités"
+#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
+msgid "VAT Declaration"
+msgstr "Déclaration TVA"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr "Actifs"
+
+#. module: l10n_lu
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
+msgstr "Capitaux propres"
+
+#. module: l10n_lu
+#: view:vat.declaration.report:0
+msgid "Cancel"
+msgstr ""
 
 #. module: l10n_lu
 #: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
@@ -108,34 +99,15 @@ msgstr ""
 msgid "Expense"
 msgstr "Charges"
 
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_creances
+msgid "Créances"
+msgstr ""
+
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_root
 msgid "View"
 msgstr "Vue"
 
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_creances
-msgid "Créances"
-msgstr ""
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "Erreur ! Vous ne pouvez pas créer de codes de taxe récursifs"
diff --git a/addons/l10n_lu/i18n/hr.po b/addons/l10n_lu/i18n/hr.po
index db327ec07a7..3b288ffc488 100644
--- a/addons/l10n_lu/i18n/hr.po
+++ b/addons/l10n_lu/i18n/hr.po
@@ -6,97 +6,88 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 07:19+0000\n"
 "Last-Translator: Miroslav Stampar <miroslav.stampar@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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr ""
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr "Tvrtka"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "Prihodi"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
+msgstr "Gotovina"
 
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr "Razdoblje"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr "Obveza"
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr "Sredstvo"
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr "Prihodi"
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr "Greška ! Ne možete kreirati rekurzivne predloške računa."
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr "Tvrtka"
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr "VAT Deklaracija"
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
-msgstr "Obveza"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr "Sredstvo"
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr "Greška ! Ne možete kreirati rekurzivne Porezne Kodove."
-
-#. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
-msgstr "Gotovina"
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
+msgstr ""
+
+#. module: l10n_lu
+#: view:vat.declaration.report:0
+msgid "Cancel"
+msgstr "Odustani"
 
 #. module: l10n_lu
 #: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
@@ -108,40 +99,24 @@ msgstr ""
 msgid "Expense"
 msgstr "Trošak"
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr "Prikaz"
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr "Razdoblje"
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr "Odustani"
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
 
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr "Prikaz"
+
 #~ msgid "Luxembourg VAT Declaration"
 #~ msgstr "Luksemburg VAT Deklaracija"
 
 #~ msgid "Print Taxes Statement"
 #~ msgstr "Isprintaj poreznu stavku"
+
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "Greška ! Ne možete kreirati rekurzivne predloške računa."
+
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "Greška ! Ne možete kreirati rekurzivne Porezne Kodove."
diff --git a/addons/l10n_lu/i18n/hu.po b/addons/l10n_lu/i18n/hu.po
index 1d6354a75a3..0fa2a2ad363 100644
--- a/addons/l10n_lu/i18n/hu.po
+++ b/addons/l10n_lu/i18n/hu.po
@@ -6,30 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
 msgstr ""
 
 #. module: l10n_lu
@@ -37,65 +47,46 @@ msgstr ""
 msgid "Luxembourg"
 msgstr ""
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr ""
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr ""
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
+#: view:vat.declaration.report:0
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_lu
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr ""
diff --git a/addons/l10n_lu/i18n/id.po b/addons/l10n_lu/i18n/id.po
index 39a75771d54..4205f0ede38 100644
--- a/addons/l10n_lu/i18n/id.po
+++ b/addons/l10n_lu/i18n/id.po
@@ -6,96 +6,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-09 17:57+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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr "Modal"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "Pendapatan"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
+msgstr ""
 
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu
 msgid "Luxembourg"
 msgstr ""
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr ""
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr "Aktiva"
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr "Pendapatan"
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr ""
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr "Aktiva"
+
+#. module: l10n_lu
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
+msgstr "Modal"
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
+#: view:vat.declaration.report:0
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_lu
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr "Biaya"
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr "Tampilan"
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr "Tampilan"
diff --git a/addons/l10n_lu/i18n/it.po b/addons/l10n_lu/i18n/it.po
index 2f7b26d52ab..46e27ee2b5d 100644
--- a/addons/l10n_lu/i18n/it.po
+++ b/addons/l10n_lu/i18n/it.po
@@ -6,66 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-10-30 14:09+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-10-31 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr "Capitale"
-
-#. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu
-msgid "Luxembourg"
-msgstr "Lussemburgo"
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "pdf not created !"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr "Attività"
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr "Entrata"
-
 #. module: l10n_lu
 #: view:vat.declaration.report:0
 msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
@@ -74,9 +33,24 @@ msgid "Company"
 msgstr "Società"
 
 #. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
-msgid "VAT Declaration"
-msgstr "Dichiarazione IVA"
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "Entrata"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
+msgstr "Contante"
+
+#. module: l10n_lu
+#: model:ir.ui.menu,name:l10n_lu.legal_lu
+msgid "Luxembourg"
+msgstr "Lussemburgo"
+
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr "Periodo"
 
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_liability
@@ -84,19 +58,36 @@ msgid "Liability"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "pdf not created !"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
+msgid "VAT Declaration"
+msgstr "Dichiarazione IVA"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr "Attività"
+
+#. module: l10n_lu
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
-msgstr "Contante"
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
+msgstr "Capitale"
+
+#. module: l10n_lu
+#: view:vat.declaration.report:0
+msgid "Cancel"
+msgstr "Cancella"
 
 #. module: l10n_lu
 #: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr "Uscita"
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr "Vista"
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr "Periodo"
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr "Cancella"
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr "Vista"
diff --git a/addons/l10n_lu/i18n/ko.po b/addons/l10n_lu/i18n/ko.po
index 52677837918..34d53611d31 100644
--- a/addons/l10n_lu/i18n/ko.po
+++ b/addons/l10n_lu/i18n/ko.po
@@ -7,30 +7,40 @@ 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-03 15:43+0000\n"
 "PO-Revision-Date: 2009-07-03 07:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
 msgstr ""
 
 #. module: l10n_lu
@@ -38,65 +48,46 @@ msgstr ""
 msgid "Luxembourg"
 msgstr ""
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr ""
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr ""
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
+#: view:vat.declaration.report:0
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_lu
@@ -109,34 +100,12 @@ msgstr ""
 msgid "Expense"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr ""
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_lu/i18n/lt.po b/addons/l10n_lu/i18n/lt.po
index e759c1e5ea2..b290d9a29bf 100644
--- a/addons/l10n_lu/i18n/lt.po
+++ b/addons/l10n_lu/i18n/lt.po
@@ -6,30 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 21:27+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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "Pajamos"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
 msgstr ""
 
 #. module: l10n_lu
@@ -37,65 +47,46 @@ msgstr ""
 msgid "Luxembourg"
 msgstr ""
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr ""
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr "Pajamos"
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr ""
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
+#: view:vat.declaration.report:0
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_lu
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr "Išlaidos"
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr "Žiūrėti"
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr "Žiūrėti"
diff --git a/addons/l10n_lu/i18n/nl.po b/addons/l10n_lu/i18n/nl.po
index 797c1a642b0..68b77a2c13c 100644
--- a/addons/l10n_lu/i18n/nl.po
+++ b/addons/l10n_lu/i18n/nl.po
@@ -6,66 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-04-10 09:32+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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr "Vermogen"
-
-#. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu
-msgid "Luxembourg"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "pdf not created !"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr "Activa"
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr "Inkomen"
-
 #. module: l10n_lu
 #: view:vat.declaration.report:0
 msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
@@ -74,8 +33,23 @@ msgid "Company"
 msgstr ""
 
 #. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
-msgid "VAT Declaration"
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "Inkomen"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
+msgstr "Contanten"
+
+#. module: l10n_lu
+#: model:ir.ui.menu,name:l10n_lu.legal_lu
+msgid "Luxembourg"
+msgstr ""
+
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
 msgstr ""
 
 #. module: l10n_lu
@@ -84,19 +58,36 @@ msgid "Liability"
 msgstr "Verantwoordelijkheid"
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "pdf not created !"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
+msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
-msgstr "Contanten"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr "Activa"
+
+#. module: l10n_lu
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
+msgstr "Vermogen"
+
+#. module: l10n_lu
+#: view:vat.declaration.report:0
+msgid "Cancel"
+msgstr ""
 
 #. module: l10n_lu
 #: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr "Uitgave"
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr "Aanzicht"
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr "Aanzicht"
diff --git a/addons/l10n_lu/i18n/nl_BE.po b/addons/l10n_lu/i18n/nl_BE.po
index 6ac85bda774..bc49cd1af16 100644
--- a/addons/l10n_lu/i18n/nl_BE.po
+++ b/addons/l10n_lu/i18n/nl_BE.po
@@ -6,30 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-04-24 14:57+0000\n"
 "Last-Translator: <>\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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
 msgstr ""
 
 #. module: l10n_lu
@@ -37,65 +47,46 @@ msgstr ""
 msgid "Luxembourg"
 msgstr ""
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr ""
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr ""
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
+#: view:vat.declaration.report:0
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_lu
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr ""
diff --git a/addons/l10n_lu/i18n/oc.po b/addons/l10n_lu/i18n/oc.po
index e6780936767..6e96227b920 100644
--- a/addons/l10n_lu/i18n/oc.po
+++ b/addons/l10n_lu/i18n/oc.po
@@ -7,66 +7,25 @@ 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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 07:19+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu
-msgid "Luxembourg"
-msgstr "Luxemborg"
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "pdf not created !"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr "Produches"
-
 #. module: l10n_lu
 #: view:vat.declaration.report:0
 msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
@@ -75,8 +34,23 @@ msgid "Company"
 msgstr "Entrepresa"
 
 #. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
-msgid "VAT Declaration"
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "Produches"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
+msgstr ""
+
+#. module: l10n_lu
+#: model:ir.ui.menu,name:l10n_lu.legal_lu
+msgid "Luxembourg"
+msgstr "Luxemborg"
+
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
 msgstr ""
 
 #. module: l10n_lu
@@ -85,20 +59,37 @@ msgid "Liability"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "pdf not created !"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
+msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
 msgstr ""
 
+#. module: l10n_lu
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
+msgstr ""
+
+#. module: l10n_lu
+#: view:vat.declaration.report:0
+msgid "Cancel"
+msgstr "Anullar"
+
 #. module: l10n_lu
 #: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
 msgid "Luxembourg - Plan Comptable Minimum Normalise"
@@ -109,34 +100,12 @@ msgstr ""
 msgid "Expense"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr "Afichatge"
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr "Anullar"
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr "Afichatge"
diff --git a/addons/l10n_lu/i18n/pl.po b/addons/l10n_lu/i18n/pl.po
index 01a77a8c8ae..8317e03344c 100644
--- a/addons/l10n_lu/i18n/pl.po
+++ b/addons/l10n_lu/i18n/pl.po
@@ -6,30 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-04-10 09:32+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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
 msgstr ""
 
 #. module: l10n_lu
@@ -37,65 +47,46 @@ msgstr ""
 msgid "Luxembourg"
 msgstr ""
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr ""
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr "Własność"
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr ""
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr "Własność"
+
+#. module: l10n_lu
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
+#: view:vat.declaration.report:0
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_lu
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr ""
diff --git a/addons/l10n_lu/i18n/pt.po b/addons/l10n_lu/i18n/pt.po
index 20973de20f2..f4503642a8a 100644
--- a/addons/l10n_lu/i18n/pt.po
+++ b/addons/l10n_lu/i18n/pt.po
@@ -6,36 +6,56 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-09-16 16:18+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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr "Situação liquida"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "Receita"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
+msgstr "Dinheiro"
 
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu
 msgid "Luxembourg"
-msgstr ""
+msgstr "Luxemburgo"
+
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr "Responsabilidade"
 
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
@@ -43,60 +63,31 @@ msgstr ""
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr "Activo"
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr "Receita"
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr ""
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr "Declaração do IVA"
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
-msgstr "Responsabilidade"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr "Activo"
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
+msgstr "Situação liquida"
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
-msgstr "Dinheiro"
+#: view:vat.declaration.report:0
+msgid "Cancel"
+msgstr "Cancelar"
 
 #. module: l10n_lu
 #: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr "Despesa"
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr "Ecrã"
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr "Vista"
diff --git a/addons/l10n_lu/i18n/pt_BR.po b/addons/l10n_lu/i18n/pt_BR.po
index 3ec1570d9e7..86454225c3e 100644
--- a/addons/l10n_lu/i18n/pt_BR.po
+++ b/addons/l10n_lu/i18n/pt_BR.po
@@ -6,66 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-04-10 09:32+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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr "Patrimônio Líquido"
-
-#. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu
-msgid "Luxembourg"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "pdf not created !"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr "Ativo"
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr "Receita"
-
 #. module: l10n_lu
 #: view:vat.declaration.report:0
 msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
@@ -74,8 +33,23 @@ msgid "Company"
 msgstr ""
 
 #. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
-msgid "VAT Declaration"
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "Receita"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
+msgstr ""
+
+#. module: l10n_lu
+#: model:ir.ui.menu,name:l10n_lu.legal_lu
+msgid "Luxembourg"
+msgstr ""
+
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
 msgstr ""
 
 #. module: l10n_lu
@@ -84,18 +58,35 @@ msgid "Liability"
 msgstr "Responsabilidade"
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "pdf not created !"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
+msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr "Ativo"
+
+#. module: l10n_lu
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
+msgstr "Patrimônio Líquido"
+
+#. module: l10n_lu
+#: view:vat.declaration.report:0
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_lu
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr "Despesa"
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr "Visualizar"
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr "Visualizar"
diff --git a/addons/l10n_lu/i18n/ro.po b/addons/l10n_lu/i18n/ro.po
index 1d6354a75a3..0fa2a2ad363 100644
--- a/addons/l10n_lu/i18n/ro.po
+++ b/addons/l10n_lu/i18n/ro.po
@@ -6,30 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
 msgstr ""
 
 #. module: l10n_lu
@@ -37,65 +47,46 @@ msgstr ""
 msgid "Luxembourg"
 msgstr ""
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr ""
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr ""
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
+#: view:vat.declaration.report:0
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_lu
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr ""
diff --git a/addons/l10n_lu/i18n/ru.po b/addons/l10n_lu/i18n/ru.po
index 4e5361491fa..55cc3e6fe7f 100644
--- a/addons/l10n_lu/i18n/ru.po
+++ b/addons/l10n_lu/i18n/ru.po
@@ -6,66 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-03 07:20+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr "Собственные средства"
-
-#. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu
-msgid "Luxembourg"
-msgstr "Люксембург"
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "pdf not created !"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr "Активы"
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr "Доход"
-
 #. module: l10n_lu
 #: view:vat.declaration.report:0
 msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
@@ -74,9 +33,24 @@ msgid "Company"
 msgstr "Компания"
 
 #. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
-msgid "VAT Declaration"
-msgstr "Декларация НДС"
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "Доход"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
+msgstr "Наличные"
+
+#. module: l10n_lu
+#: model:ir.ui.menu,name:l10n_lu.legal_lu
+msgid "Luxembourg"
+msgstr "Люксембург"
+
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr "Период"
 
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_liability
@@ -84,19 +58,36 @@ msgid "Liability"
 msgstr "Обязательства"
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "pdf not created !"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
+msgid "VAT Declaration"
+msgstr "Декларация НДС"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr "Активы"
+
+#. module: l10n_lu
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
-msgstr "Наличные"
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
+msgstr "Собственные средства"
+
+#. module: l10n_lu
+#: view:vat.declaration.report:0
+msgid "Cancel"
+msgstr "Отмена"
 
 #. module: l10n_lu
 #: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr "Расход"
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr "Вид"
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr "Период"
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr "Отмена"
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr "Вид"
diff --git a/addons/l10n_lu/i18n/sl.po b/addons/l10n_lu/i18n/sl.po
index 053e4da186c..9d37080a3f2 100644
--- a/addons/l10n_lu/i18n/sl.po
+++ b/addons/l10n_lu/i18n/sl.po
@@ -6,97 +6,88 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-17 07:46+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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr "Stanje bilance"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr "Družba"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "Prihodki"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
+msgstr "Gotovina"
 
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr "Obdobje"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr "Odgovornost"
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr "Delovno sredstvo"
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr "Prihodki"
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr "Napaka! Ne morete oblikovati rekurzivnih predlog kontov."
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr "Družba"
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
-msgstr "Odgovornost"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr "Delovno sredstvo"
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr "Napaka! Ne morete oblikovati rekurzivnih davčnih oznak."
-
-#. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
-msgstr "Gotovina"
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
+msgstr "Stanje bilance"
+
+#. module: l10n_lu
+#: view:vat.declaration.report:0
+msgid "Cancel"
+msgstr "Prekliči"
 
 #. module: l10n_lu
 #: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
@@ -108,37 +99,21 @@ msgstr ""
 msgid "Expense"
 msgstr "Strošek"
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr "Pogled:"
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr "Obdobje"
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr "Prekliči"
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
 
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr "Pogled:"
+
 #~ msgid "VAT Legal Declaration"
 #~ msgstr "Pravna izjava o DDV"
+
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "Napaka! Ne morete oblikovati rekurzivnih predlog kontov."
+
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "Napaka! Ne morete oblikovati rekurzivnih davčnih oznak."
diff --git a/addons/l10n_lu/i18n/sq.po b/addons/l10n_lu/i18n/sq.po
index 9defdf3c9ec..60f3aa650b4 100644
--- a/addons/l10n_lu/i18n/sq.po
+++ b/addons/l10n_lu/i18n/sq.po
@@ -7,30 +7,40 @@ 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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
 msgstr ""
 
 #. module: l10n_lu
@@ -38,65 +48,46 @@ msgstr ""
 msgid "Luxembourg"
 msgstr ""
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr ""
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr ""
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
+#: view:vat.declaration.report:0
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_lu
@@ -109,34 +100,12 @@ msgstr ""
 msgid "Expense"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr ""
diff --git a/addons/l10n_lu/i18n/sr@latin.po b/addons/l10n_lu/i18n/sr@latin.po
index 79eb71247ac..49e5a618c70 100644
--- a/addons/l10n_lu/i18n/sr@latin.po
+++ b/addons/l10n_lu/i18n/sr@latin.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-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/sv.po b/addons/l10n_lu/i18n/sv.po
index eec1e18d022..4a81c970e23 100644
--- a/addons/l10n_lu/i18n/sv.po
+++ b/addons/l10n_lu/i18n/sv.po
@@ -6,65 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-11-23 09:21+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-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu
-msgid "Luxembourg"
-msgstr "Luxemburg"
-
-#. module: l10n_lu
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr "Tillgång"
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr "Intäkt"
-
 #. module: l10n_lu
 #: view:vat.declaration.report:0
 msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
@@ -73,8 +33,23 @@ msgid "Company"
 msgstr "Företag"
 
 #. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
-msgid "VAT Declaration"
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "Intäkt"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
+msgstr "Kontant"
+
+#. module: l10n_lu
+#: model:ir.ui.menu,name:l10n_lu.legal_lu
+msgid "Luxembourg"
+msgstr "Luxemburg"
+
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
 msgstr ""
 
 #. module: l10n_lu
@@ -83,24 +58,36 @@ msgid "Liability"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "pdf not created !"
 msgstr ""
 
 #. module: l10n_lu
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
+#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
+msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr "Tillgång"
+
+#. module: l10n_lu
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
-msgstr "Kontant"
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
+msgstr ""
+
+#. module: l10n_lu
+#: view:vat.declaration.report:0
+msgid "Cancel"
+msgstr "Avbryt"
 
 #. module: l10n_lu
 #: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
@@ -112,45 +99,12 @@ msgstr "Luxembourg - Plan Comptable Minimum Normalise"
 msgid "Expense"
 msgstr "Utgift"
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr "Visa"
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "pdf not created !"
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr "Avbryt"
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
 
 #. module: l10n_lu
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr "Visa"
diff --git a/addons/l10n_lu/i18n/tlh.po b/addons/l10n_lu/i18n/tlh.po
index dae45c23a15..2da3d248f2e 100644
--- a/addons/l10n_lu/i18n/tlh.po
+++ b/addons/l10n_lu/i18n/tlh.po
@@ -6,30 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
 msgstr ""
 
 #. module: l10n_lu
@@ -37,65 +47,46 @@ msgstr ""
 msgid "Luxembourg"
 msgstr ""
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr ""
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr ""
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
+#: view:vat.declaration.report:0
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_lu
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr ""
diff --git a/addons/l10n_lu/i18n/tr.po b/addons/l10n_lu/i18n/tr.po
index 82a80c35364..2f20b6c2d4c 100644
--- a/addons/l10n_lu/i18n/tr.po
+++ b/addons/l10n_lu/i18n/tr.po
@@ -6,30 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2010-09-09 07:17+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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
 msgstr ""
 
 #. module: l10n_lu
@@ -37,65 +47,46 @@ msgstr ""
 msgid "Luxembourg"
 msgstr ""
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr ""
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr "Varlık"
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr ""
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr "Varlık"
+
+#. module: l10n_lu
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
+#: view:vat.declaration.report:0
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_lu
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr "Gider"
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr "Görünüm"
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr "Görünüm"
diff --git a/addons/l10n_lu/i18n/uk.po b/addons/l10n_lu/i18n/uk.po
index ec538cef652..a7fa2798c60 100644
--- a/addons/l10n_lu/i18n/uk.po
+++ b/addons/l10n_lu/i18n/uk.po
@@ -6,98 +6,89 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-04-10 09:32+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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr "Акціонерний капітал"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "Дохід"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
+msgstr "Каса"
 
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu
 msgid "Luxembourg"
 msgstr ""
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr ""
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr "Активи"
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr "Дохід"
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr ""
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr "Активи"
+
+#. module: l10n_lu
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
+msgstr "Акціонерний капітал"
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:vat.declaration.report:0
+msgid "Cancel"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
-msgstr "Каса"
-
 #. module: l10n_lu
 #: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
 msgid "Luxembourg - Plan Comptable Minimum Normalise"
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr "Витрати"
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr "Перегляд"
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr "Перегляд"
diff --git a/addons/l10n_lu/i18n/vi.po b/addons/l10n_lu/i18n/vi.po
index 0eed427d9f6..f80c73b8e63 100644
--- a/addons/l10n_lu/i18n/vi.po
+++ b/addons/l10n_lu/i18n/vi.po
@@ -7,30 +7,40 @@ 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-03 15:43+0000\n"
 "PO-Revision-Date: 2010-08-02 14:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
 msgstr ""
 
 #. module: l10n_lu
@@ -38,65 +48,46 @@ msgstr ""
 msgid "Luxembourg"
 msgstr ""
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr ""
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr ""
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
+#: view:vat.declaration.report:0
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_lu
@@ -109,34 +100,12 @@ msgstr ""
 msgid "Expense"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr ""
diff --git a/addons/l10n_lu/i18n/zh_CN.po b/addons/l10n_lu/i18n/zh_CN.po
index 8bf7346359b..52da3f151f4 100644
--- a/addons/l10n_lu/i18n/zh_CN.po
+++ b/addons/l10n_lu/i18n/zh_CN.po
@@ -6,66 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-11-17 07:46+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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu
-msgid "Luxembourg"
-msgstr "卢森堡"
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "pdf not created !"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr "资产"
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr "收入"
-
 #. module: l10n_lu
 #: view:vat.declaration.report:0
 msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
@@ -74,8 +33,23 @@ msgid "Company"
 msgstr "公司"
 
 #. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
-msgid "VAT Declaration"
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "收入"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
+msgstr "现金"
+
+#. module: l10n_lu
+#: model:ir.ui.menu,name:l10n_lu.legal_lu
+msgid "Luxembourg"
+msgstr "卢森堡"
+
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
 msgstr ""
 
 #. module: l10n_lu
@@ -84,19 +58,36 @@ msgid "Liability"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "pdf not created !"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
+msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
-msgstr "现金"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr "资产"
+
+#. module: l10n_lu
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
+msgstr ""
+
+#. module: l10n_lu
+#: view:vat.declaration.report:0
+msgid "Cancel"
+msgstr "取消"
 
 #. module: l10n_lu
 #: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr "费用"
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr "视图"
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr "取消"
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr "视图"
diff --git a/addons/l10n_lu/i18n/zh_TW.po b/addons/l10n_lu/i18n/zh_TW.po
index 84dab722a57..4960f13f881 100644
--- a/addons/l10n_lu/i18n/zh_TW.po
+++ b/addons/l10n_lu/i18n/zh_TW.po
@@ -6,30 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
 "PO-Revision-Date: 2009-01-23 17:17+0000\n"
 "Last-Translator: <>\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-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
 msgstr ""
 
 #. module: l10n_lu
@@ -37,65 +47,46 @@ msgstr ""
 msgid "Luxembourg"
 msgstr ""
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr ""
+
 #. module: l10n_lu
 #: code:addons/l10n_lu/wizard/print_vat.py:0
 #, python-format
 msgid "pdf not created !"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Print Tax Statements"
-msgstr ""
-
-#. module: l10n_lu
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,tax_code_id:0
-msgid "Company"
-msgstr ""
-
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
 msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: code:addons/l10n_lu/wizard/print_vat.py:0
+#, python-format
+msgid "Please check if package pdftk is installed!"
 msgstr ""
 
 #. module: l10n_lu
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
+#: view:vat.declaration.report:0
+msgid "Cancel"
 msgstr ""
 
 #. module: l10n_lu
@@ -108,34 +99,12 @@ msgstr ""
 msgid "Expense"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
-msgstr ""
-
-#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
-#, python-format
-msgid "Please check if package pdftk is installed!"
-msgstr ""
-
-#. module: l10n_lu
-#: view:vat.declaration.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_creances
 msgid "Créances"
 msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr ""
diff --git a/addons/l10n_ma/i18n/fr.po b/addons/l10n_ma/i18n/fr.po
index b39cdd7d8f5..898f483c685 100644
--- a/addons/l10n_ma/i18n/fr.po
+++ b/addons/l10n_ma/i18n/fr.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-09 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ma
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_ma/i18n/sr@latin.po b/addons/l10n_ma/i18n/sr@latin.po
index 0457631ff61..4fd0da3ec20 100644
--- a/addons/l10n_ma/i18n/sr@latin.po
+++ b/addons/l10n_ma/i18n/sr@latin.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-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ma
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/ca.po b/addons/marketing/i18n/ca.po
index ddd62fa0403..b82e1566f56 100644
--- a/addons/marketing/i18n/ca.po
+++ b/addons/marketing/i18n/ca.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
diff --git a/addons/marketing/i18n/de.po b/addons/marketing/i18n/de.po
index 2bca514c6c4..4b386ea02b3 100644
--- a/addons/marketing/i18n/de.po
+++ b/addons/marketing/i18n/de.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
diff --git a/addons/marketing/i18n/es.po b/addons/marketing/i18n/es.po
index e670eb458c6..88cd02358b8 100644
--- a/addons/marketing/i18n/es.po
+++ b/addons/marketing/i18n/es.po
@@ -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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
diff --git a/addons/marketing/i18n/fr.po b/addons/marketing/i18n/fr.po
index ff6af86e09c..b9827cc512b 100644
--- a/addons/marketing/i18n/fr.po
+++ b/addons/marketing/i18n/fr.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
diff --git a/addons/marketing/i18n/it.po b/addons/marketing/i18n/it.po
index 450a8809b0f..62fcd002143 100644
--- a/addons/marketing/i18n/it.po
+++ b/addons/marketing/i18n/it.po
@@ -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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
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/i18n/mn.po b/addons/marketing/i18n/mn.po
index c6f6bbde824..84d3d34fade 100644
--- a/addons/marketing/i18n/mn.po
+++ b/addons/marketing/i18n/mn.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
diff --git a/addons/marketing/i18n/nl.po b/addons/marketing/i18n/nl.po
index c631505cf66..867a5cf2f4e 100644
--- a/addons/marketing/i18n/nl.po
+++ b/addons/marketing/i18n/nl.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
diff --git a/addons/marketing/i18n/pl.po b/addons/marketing/i18n/pl.po
index 2326b3df581..ab16e5b8a95 100644
--- a/addons/marketing/i18n/pl.po
+++ b/addons/marketing/i18n/pl.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
diff --git a/addons/marketing/i18n/pt.po b/addons/marketing/i18n/pt.po
index 8270334cf3f..3a87a61f189 100644
--- a/addons/marketing/i18n/pt.po
+++ b/addons/marketing/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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
diff --git a/addons/marketing/i18n/pt_BR.po b/addons/marketing/i18n/pt_BR.po
index 8afe601b5f1..cefafe2d81b 100644
--- a/addons/marketing/i18n/pt_BR.po
+++ b/addons/marketing/i18n/pt_BR.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
diff --git a/addons/marketing/i18n/ru.po b/addons/marketing/i18n/ru.po
index 0480e14a1ed..8a7c473b40b 100644
--- a/addons/marketing/i18n/ru.po
+++ b/addons/marketing/i18n/ru.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
diff --git a/addons/marketing/i18n/sk.po b/addons/marketing/i18n/sk.po
index cb67067739c..a433acdc20b 100644
--- a/addons/marketing/i18n/sk.po
+++ b/addons/marketing/i18n/sk.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
diff --git a/addons/marketing/i18n/sr.po b/addons/marketing/i18n/sr.po
index 84468ae3cad..56553ebdd83 100644
--- a/addons/marketing/i18n/sr.po
+++ b/addons/marketing/i18n/sr.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
diff --git a/addons/marketing/i18n/sr@latin.po b/addons/marketing/i18n/sr@latin.po
index 08683bfceb4..efb3b351cd1 100644
--- a/addons/marketing/i18n/sr@latin.po
+++ b/addons/marketing/i18n/sr@latin.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
diff --git a/addons/marketing/i18n/sv.po b/addons/marketing/i18n/sv.po
index 41c828529e2..5931d4505da 100644
--- a/addons/marketing/i18n/sv.po
+++ b/addons/marketing/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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
diff --git a/addons/marketing/i18n/zh_CN.po b/addons/marketing/i18n/zh_CN.po
index fac4d014cee..86ab0d7a7b0 100644
--- a/addons/marketing/i18n/zh_CN.po
+++ b/addons/marketing/i18n/zh_CN.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
diff --git a/addons/marketing_campaign/i18n/de.po b/addons/marketing_campaign/i18n/de.po
index 97a082b2e4a..f134be8ad17 100644
--- a/addons/marketing_campaign/i18n/de.po
+++ b/addons/marketing_campaign/i18n/de.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-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
diff --git a/addons/marketing_campaign/i18n/es.po b/addons/marketing_campaign/i18n/es.po
index 37216b7f6ea..99fd9ab80c0 100644
--- a/addons/marketing_campaign/i18n/es.po
+++ b/addons/marketing_campaign/i18n/es.po
@@ -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-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
diff --git a/addons/marketing_campaign/i18n/fr.po b/addons/marketing_campaign/i18n/fr.po
index ac69c4a8af3..ce8e436514c 100644
--- a/addons/marketing_campaign/i18n/fr.po
+++ b/addons/marketing_campaign/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-05 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
diff --git a/addons/marketing_campaign/i18n/it.po b/addons/marketing_campaign/i18n/it.po
index 5f8a3523c6b..56272a8e01b 100644
--- a/addons/marketing_campaign/i18n/it.po
+++ b/addons/marketing_campaign/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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-25 06:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-26 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
@@ -34,8 +34,7 @@ msgid "The current step for this item has no email or report to preview."
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
-#, python-format
+#: constraint:marketing.campaign.transition:0
 msgid "The To/From Activity of transition must be of the same Campaign "
 msgstr ""
 
@@ -48,8 +47,8 @@ msgid ""
 msgstr ""
 
 #. module: marketing_campaign
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Time"
 msgstr ""
 
 #. module: marketing_campaign
@@ -86,11 +85,6 @@ msgstr ""
 msgid "Trigger"
 msgstr ""
 
-#. module: marketing_campaign
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
 msgid "# of Actions"
@@ -196,6 +190,12 @@ msgstr ""
 msgid "Year(s)"
 msgstr ""
 
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Sorry, campaign duplication is not supported at the moment."
+msgstr ""
+
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,sync_last_date:0
 msgid ""
@@ -312,11 +312,6 @@ msgstr ""
 msgid "Don't delete workitems"
 msgstr ""
 
-#. module: marketing_campaign
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,state:0
@@ -426,16 +421,6 @@ msgid ""
 "in the Reporting section"
 msgstr ""
 
-#. module: marketing_campaign
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr ""
-
-#. module: marketing_campaign
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Hour(s)"
@@ -571,11 +556,21 @@ msgstr ""
 msgid "Campaign Analysis"
 msgstr ""
 
+#. module: marketing_campaign
+#: sql_constraint:marketing.campaign.transition:0
+msgid "The interval must be positive or zero"
+msgstr ""
+
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test in Realtime"
 msgstr ""
 
+#. module: marketing_campaign
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr ""
+
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test Directly"
@@ -586,6 +581,11 @@ msgstr ""
 msgid "Directory"
 msgstr ""
 
+#. module: marketing_campaign
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: selection:marketing.campaign,state:0
@@ -594,17 +594,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: marketing_campaign
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: marketing_campaign
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Preview"
@@ -786,6 +775,12 @@ msgstr ""
 msgid "Done"
 msgstr ""
 
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Operation not supported"
+msgstr ""
+
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_email_template
 msgid "Email Templates for Models"
@@ -798,8 +793,7 @@ msgid "Close"
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
-#, python-format
+#: constraint:marketing.campaign.segment:0
 msgid "Model of filter must be same as resource model of Campaign "
 msgstr ""
 
@@ -808,11 +802,6 @@ msgstr ""
 msgid "Synchronize Manually"
 msgstr ""
 
-#. module: marketing_campaign
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:0
 #, python-format
@@ -829,11 +818,6 @@ msgid ""
 "created in the system."
 msgstr ""
 
-#. module: marketing_campaign
-#: selection:marketing.campaign.transition,trigger:0
-msgid "Time"
-msgstr ""
-
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
 msgid "Campaign Transition"
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/i18n/mn.po b/addons/marketing_campaign/i18n/mn.po
index 2db862f2509..37a5ba2a781 100644
--- a/addons/marketing_campaign/i18n/mn.po
+++ b/addons/marketing_campaign/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-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-24 07:20+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-11-25 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
@@ -34,8 +34,7 @@ msgid "The current step for this item has no email or report to preview."
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
-#, python-format
+#: constraint:marketing.campaign.transition:0
 msgid "The To/From Activity of transition must be of the same Campaign "
 msgstr ""
 
@@ -48,8 +47,8 @@ msgid ""
 msgstr ""
 
 #. module: marketing_campaign
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Time"
 msgstr ""
 
 #. module: marketing_campaign
@@ -86,11 +85,6 @@ msgstr ""
 msgid "Trigger"
 msgstr ""
 
-#. module: marketing_campaign
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
 msgid "# of Actions"
@@ -196,6 +190,12 @@ msgstr ""
 msgid "Year(s)"
 msgstr ""
 
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Sorry, campaign duplication is not supported at the moment."
+msgstr ""
+
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,sync_last_date:0
 msgid ""
@@ -312,11 +312,6 @@ msgstr ""
 msgid "Don't delete workitems"
 msgstr ""
 
-#. module: marketing_campaign
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,state:0
@@ -426,16 +421,6 @@ msgid ""
 "in the Reporting section"
 msgstr ""
 
-#. module: marketing_campaign
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr ""
-
-#. module: marketing_campaign
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Hour(s)"
@@ -571,11 +556,21 @@ msgstr ""
 msgid "Campaign Analysis"
 msgstr ""
 
+#. module: marketing_campaign
+#: sql_constraint:marketing.campaign.transition:0
+msgid "The interval must be positive or zero"
+msgstr ""
+
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test in Realtime"
 msgstr ""
 
+#. module: marketing_campaign
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr ""
+
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test Directly"
@@ -586,6 +581,11 @@ msgstr ""
 msgid "Directory"
 msgstr ""
 
+#. module: marketing_campaign
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: selection:marketing.campaign,state:0
@@ -594,17 +594,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: marketing_campaign
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: marketing_campaign
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Preview"
@@ -786,6 +775,12 @@ msgstr ""
 msgid "Done"
 msgstr ""
 
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Operation not supported"
+msgstr ""
+
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_email_template
 msgid "Email Templates for Models"
@@ -798,8 +793,7 @@ msgid "Close"
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
-#, python-format
+#: constraint:marketing.campaign.segment:0
 msgid "Model of filter must be same as resource model of Campaign "
 msgstr ""
 
@@ -808,11 +802,6 @@ msgstr ""
 msgid "Synchronize Manually"
 msgstr ""
 
-#. module: marketing_campaign
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:0
 #, python-format
@@ -829,11 +818,6 @@ msgid ""
 "created in the system."
 msgstr ""
 
-#. module: marketing_campaign
-#: selection:marketing.campaign.transition,trigger:0
-msgid "Time"
-msgstr ""
-
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
 msgid "Campaign Transition"
diff --git a/addons/marketing_campaign/i18n/nl.po b/addons/marketing_campaign/i18n/nl.po
index 8b97f256602..0e70667a409 100644
--- a/addons/marketing_campaign/i18n/nl.po
+++ b/addons/marketing_campaign/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-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-19 07:35+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-11-20 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
@@ -34,8 +34,7 @@ msgid "The current step for this item has no email or report to preview."
 msgstr "De huidige stap voor dit item heeft geen email of rapport voorbeeld."
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
-#, python-format
+#: constraint:marketing.campaign.transition:0
 msgid "The To/From Activity of transition must be of the same Campaign "
 msgstr ""
 "De naar/van activiteit van de overgang moet van dezelfde categorie zijn "
@@ -51,9 +50,9 @@ msgstr ""
 "enige activiteit met een signaal en geen voorgaande activiteit)"
 
 #. module: marketing_campaign
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Time"
+msgstr "Tijd"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.activity,type:0
@@ -94,11 +93,6 @@ msgstr ""
 msgid "Trigger"
 msgstr "Activatie"
 
-#. module: marketing_campaign
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de definitie van de actie."
-
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
 msgid "# of Actions"
@@ -204,6 +198,12 @@ msgstr ""
 msgid "Year(s)"
 msgstr "Jaar(en)"
 
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Sorry, campaign duplication is not supported at the moment."
+msgstr ""
+
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,sync_last_date:0
 msgid ""
@@ -329,11 +329,6 @@ msgstr "Overgangen"
 msgid "Don't delete workitems"
 msgstr ""
 
-#. module: marketing_campaign
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,state:0
@@ -443,16 +438,6 @@ msgid ""
 "in the Reporting section"
 msgstr ""
 
-#. module: marketing_campaign
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr "Ongeldige argumenten"
-
-#. module: marketing_campaign
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave opbouw"
-
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Hour(s)"
@@ -591,11 +576,21 @@ msgstr "Relatie veld"
 msgid "Campaign Analysis"
 msgstr "Campagne analyse"
 
+#. module: marketing_campaign
+#: sql_constraint:marketing.campaign.transition:0
+msgid "The interval must be positive or zero"
+msgstr ""
+
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test in Realtime"
 msgstr "Test in realtime"
 
+#. module: marketing_campaign
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr ""
+
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test Directly"
@@ -606,6 +601,11 @@ msgstr "Test direct"
 msgid "Directory"
 msgstr "Map"
 
+#. module: marketing_campaign
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: selection:marketing.campaign,state:0
@@ -614,18 +614,6 @@ msgstr "Map"
 msgid "Draft"
 msgstr "Concept"
 
-#. module: marketing_campaign
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fout ! U kunt geen recursief menu maken."
-
-#. module: marketing_campaign
-#: 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: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Preview"
@@ -809,6 +797,12 @@ msgstr "Hoe wordt de bestemming taak geactiveerd"
 msgid "Done"
 msgstr "Klaar"
 
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Operation not supported"
+msgstr ""
+
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_email_template
 msgid "Email Templates for Models"
@@ -821,8 +815,7 @@ msgid "Close"
 msgstr "Sluiten"
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
-#, python-format
+#: constraint:marketing.campaign.segment:0
 msgid "Model of filter must be same as resource model of Campaign "
 msgstr ""
 
@@ -831,11 +824,6 @@ msgstr ""
 msgid "Synchronize Manually"
 msgstr ""
 
-#. module: marketing_campaign
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:0
 #, python-format
@@ -853,11 +841,6 @@ msgid ""
 "created in the system."
 msgstr ""
 
-#. module: marketing_campaign
-#: selection:marketing.campaign.transition,trigger:0
-msgid "Time"
-msgstr "Tijd"
-
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
 msgid "Campaign Transition"
@@ -1061,3 +1044,20 @@ msgstr "Kosten"
 #: field:campaign.analysis,year:0
 msgid "Year"
 msgstr "Jaar"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML voor weergave opbouw"
+
+#~ msgid "Invalid arguments"
+#~ msgstr "Ongeldige argumenten"
+
+#~ 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 "Error ! You can not create recursive Menu."
+#~ msgstr "Fout ! U kunt geen recursief menu maken."
diff --git a/addons/marketing_campaign/i18n/pl.po b/addons/marketing_campaign/i18n/pl.po
index ee0ceeba4c9..f1ad80a4cc2 100644
--- a/addons/marketing_campaign/i18n/pl.po
+++ b/addons/marketing_campaign/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-29 09:18+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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
@@ -34,8 +34,7 @@ msgid "The current step for this item has no email or report to preview."
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
-#, python-format
+#: constraint:marketing.campaign.transition:0
 msgid "The To/From Activity of transition must be of the same Campaign "
 msgstr ""
 
@@ -86,11 +85,6 @@ msgstr ""
 msgid "Trigger"
 msgstr "Wyzwalacz"
 
-#. module: marketing_campaign
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
 msgid "# of Actions"
@@ -196,6 +190,12 @@ msgstr ""
 msgid "Year(s)"
 msgstr "Lat"
 
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Sorry, campaign duplication is not supported at the moment."
+msgstr ""
+
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,sync_last_date:0
 msgid ""
@@ -421,16 +421,6 @@ msgid ""
 "in the Reporting section"
 msgstr ""
 
-#. module: marketing_campaign
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr "Nieprawidłowe parametry"
-
-#. module: marketing_campaign
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Niewłaściwy XML dla architektury widoku!"
-
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Hour(s)"
@@ -542,6 +532,12 @@ msgstr ""
 msgid "Campaign Statistics"
 msgstr ""
 
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,res_id:0
+msgid "Resource ID"
+msgstr "ID zasobu"
+
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,server_action_id:0
 msgid "The action to perform when this activity is activated"
@@ -560,11 +556,21 @@ msgstr "Pole partnera"
 msgid "Campaign Analysis"
 msgstr "Analiza kampanii"
 
+#. module: marketing_campaign
+#: sql_constraint:marketing.campaign.transition:0
+msgid "The interval must be positive or zero"
+msgstr ""
+
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test in Realtime"
 msgstr "Testowanie w czasie rzeczywistym"
 
+#. module: marketing_campaign
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr ""
+
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test Directly"
@@ -575,6 +581,11 @@ msgstr "Test bezpośredni"
 msgid "Directory"
 msgstr "Katalog"
 
+#. module: marketing_campaign
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: selection:marketing.campaign,state:0
@@ -583,19 +594,6 @@ msgstr "Katalog"
 msgid "Draft"
 msgstr "Projekt"
 
-#. module: marketing_campaign
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#. module: marketing_campaign
-#: 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: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Preview"
@@ -777,6 +775,12 @@ msgstr ""
 msgid "Done"
 msgstr "Wykonano"
 
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Operation not supported"
+msgstr ""
+
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_email_template
 msgid "Email Templates for Models"
@@ -789,8 +793,7 @@ msgid "Close"
 msgstr "Zamknij"
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
-#, python-format
+#: constraint:marketing.campaign.segment:0
 msgid "Model of filter must be same as resource model of Campaign "
 msgstr ""
 
@@ -808,10 +811,14 @@ msgstr ""
 "zostaną wykonane"
 
 #. module: marketing_campaign
-#: view:marketing.campaign.workitem:0
-#: field:marketing.campaign.workitem,res_id:0
-msgid "Resource ID"
-msgstr "ID zasobu"
+#: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
+msgid ""
+"A marketing campaign is an event or activity that will help you manage and "
+"reach your partners with specific messages. A campaign can have many "
+"activities that will be triggered based on a specific situation. One "
+"possible action could be sending an email template that has previously been "
+"created in the system."
+msgstr ""
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
@@ -1017,18 +1024,36 @@ msgstr "Koszt"
 msgid "Year"
 msgstr "Rok"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
 #~ msgid "Activity Definition"
 #~ msgstr "Definicja czynności"
 
 #~ msgid "Dates"
 #~ msgstr "Daty"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Niewłaściwy XML dla architektury widoku!"
+
+#~ msgid "Invalid arguments"
+#~ msgstr "Nieprawidłowe parametry"
+
 #~ msgid "Run Date"
 #~ msgstr "Data uruchomienia"
 
+#~ 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 "Launching Date"
 #~ msgstr "Data uruchomienia"
 
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
+
 #~ msgid "Status"
 #~ msgstr "Stan"
 
diff --git a/addons/marketing_campaign/i18n/pt.po b/addons/marketing_campaign/i18n/pt.po
index d8cf1d31356..9a4a3f5c98b 100644
--- a/addons/marketing_campaign/i18n/pt.po
+++ b/addons/marketing_campaign/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-12 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
diff --git a/addons/marketing_campaign/i18n/ru.po b/addons/marketing_campaign/i18n/ru.po
index c27d864a8c2..db3d0e6e306 100644
--- a/addons/marketing_campaign/i18n/ru.po
+++ b/addons/marketing_campaign/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-10-10 07:30+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
@@ -36,8 +36,7 @@ msgstr ""
 "просмотра отчетов иили шаблонов электронной почты"
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
-#, python-format
+#: constraint:marketing.campaign.transition:0
 msgid "The To/From Activity of transition must be of the same Campaign "
 msgstr ""
 
@@ -88,11 +87,6 @@ msgstr ""
 msgid "Trigger"
 msgstr "Активатор"
 
-#. module: marketing_campaign
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
 msgid "# of Actions"
@@ -198,6 +192,12 @@ msgstr ""
 msgid "Year(s)"
 msgstr "Год (а)"
 
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Sorry, campaign duplication is not supported at the moment."
+msgstr ""
+
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,sync_last_date:0
 msgid ""
@@ -423,16 +423,6 @@ msgid ""
 "in the Reporting section"
 msgstr ""
 
-#. module: marketing_campaign
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr ""
-
-#. module: marketing_campaign
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Hour(s)"
@@ -544,6 +534,12 @@ msgstr ""
 msgid "Campaign Statistics"
 msgstr ""
 
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,res_id:0
+msgid "Resource ID"
+msgstr ""
+
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,server_action_id:0
 msgid "The action to perform when this activity is activated"
@@ -562,11 +558,21 @@ msgstr ""
 msgid "Campaign Analysis"
 msgstr ""
 
+#. module: marketing_campaign
+#: sql_constraint:marketing.campaign.transition:0
+msgid "The interval must be positive or zero"
+msgstr ""
+
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test in Realtime"
 msgstr ""
 
+#. module: marketing_campaign
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr ""
+
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test Directly"
@@ -577,6 +583,11 @@ msgstr ""
 msgid "Directory"
 msgstr ""
 
+#. module: marketing_campaign
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: selection:marketing.campaign,state:0
@@ -585,17 +596,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: marketing_campaign
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: marketing_campaign
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Preview"
@@ -777,6 +777,12 @@ msgstr ""
 msgid "Done"
 msgstr ""
 
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Operation not supported"
+msgstr ""
+
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_email_template
 msgid "Email Templates for Models"
@@ -789,8 +795,7 @@ msgid "Close"
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
-#, python-format
+#: constraint:marketing.campaign.segment:0
 msgid "Model of filter must be same as resource model of Campaign "
 msgstr ""
 
@@ -806,9 +811,13 @@ msgid "The campaign cannot be marked as done before all segments are done"
 msgstr ""
 
 #. module: marketing_campaign
-#: view:marketing.campaign.workitem:0
-#: field:marketing.campaign.workitem,res_id:0
-msgid "Resource ID"
+#: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
+msgid ""
+"A marketing campaign is an event or activity that will help you manage and "
+"reach your partners with specific messages. A campaign can have many "
+"activities that will be triggered based on a specific situation. One "
+"possible action could be sending an email template that has previously been "
+"created in the system."
 msgstr ""
 
 #. module: marketing_campaign
@@ -1015,6 +1024,9 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Недопустимое имя модели в определении действия."
+
 #~ msgid ""
 #~ "Describe type of action to be performed on the Activity.Eg : Send email,Send "
 #~ "paper.."
diff --git a/addons/marketing_campaign/i18n/sr@latin.po b/addons/marketing_campaign/i18n/sr@latin.po
index 763d66d875d..9586289ec82 100644
--- a/addons/marketing_campaign/i18n/sr@latin.po
+++ b/addons/marketing_campaign/i18n/sr@latin.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-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
diff --git a/addons/marketing_campaign/i18n/sv.po b/addons/marketing_campaign/i18n/sv.po
index f374b7c4aa8..f89118c2bc9 100644
--- a/addons/marketing_campaign/i18n/sv.po
+++ b/addons/marketing_campaign/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-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-12-02 07:47+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-03 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
@@ -34,20 +34,7 @@ msgid "The current step for this item has no email or report to preview."
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
-#, python-format
-msgid "Operation not supported"
-msgstr ""
-
-#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
-#, python-format
-msgid "Sorry, campaign duplication is not supported at the moment."
-msgstr ""
-
-#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
-#, python-format
+#: constraint:marketing.campaign.transition:0
 msgid "The To/From Activity of transition must be of the same Campaign "
 msgstr ""
 
@@ -60,9 +47,9 @@ msgid ""
 msgstr ""
 
 #. module: marketing_campaign
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Time"
+msgstr "Tid"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.activity,type:0
@@ -98,11 +85,6 @@ msgstr ""
 msgid "Trigger"
 msgstr ""
 
-#. module: marketing_campaign
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
 msgid "# of Actions"
@@ -208,6 +190,12 @@ msgstr ""
 msgid "Year(s)"
 msgstr ""
 
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Sorry, campaign duplication is not supported at the moment."
+msgstr ""
+
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,sync_last_date:0
 msgid ""
@@ -324,11 +312,6 @@ msgstr ""
 msgid "Don't delete workitems"
 msgstr ""
 
-#. module: marketing_campaign
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,state:0
@@ -438,16 +421,6 @@ msgid ""
 "in the Reporting section"
 msgstr ""
 
-#. module: marketing_campaign
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr ""
-
-#. module: marketing_campaign
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Hour(s)"
@@ -583,11 +556,21 @@ msgstr ""
 msgid "Campaign Analysis"
 msgstr ""
 
+#. module: marketing_campaign
+#: sql_constraint:marketing.campaign.transition:0
+msgid "The interval must be positive or zero"
+msgstr ""
+
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test in Realtime"
 msgstr ""
 
+#. module: marketing_campaign
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr ""
+
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test Directly"
@@ -598,6 +581,11 @@ msgstr ""
 msgid "Directory"
 msgstr ""
 
+#. module: marketing_campaign
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: selection:marketing.campaign,state:0
@@ -606,17 +594,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: marketing_campaign
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: marketing_campaign
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Preview"
@@ -798,6 +775,12 @@ msgstr ""
 msgid "Done"
 msgstr ""
 
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Operation not supported"
+msgstr ""
+
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_email_template
 msgid "Email Templates for Models"
@@ -810,8 +793,7 @@ msgid "Close"
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
-#, python-format
+#: constraint:marketing.campaign.segment:0
 msgid "Model of filter must be same as resource model of Campaign "
 msgstr ""
 
@@ -820,11 +802,6 @@ msgstr ""
 msgid "Synchronize Manually"
 msgstr ""
 
-#. module: marketing_campaign
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:0
 #, python-format
@@ -841,11 +818,6 @@ msgid ""
 "created in the system."
 msgstr ""
 
-#. module: marketing_campaign
-#: selection:marketing.campaign.transition,trigger:0
-msgid "Time"
-msgstr "Tid"
-
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
 msgid "Campaign Transition"
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/de.po b/addons/marketing_campaign_crm_demo/i18n/de.po
index 0782104121b..1fce2bdc354 100644
--- a/addons/marketing_campaign_crm_demo/i18n/de.po
+++ b/addons/marketing_campaign_crm_demo/i18n/de.po
@@ -6,7 +6,7 @@ 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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-30 15:30+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -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-01 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign_crm_demo
@@ -32,60 +32,20 @@ msgstr ""
 "Produkten. Viele Grüsse , Ihr OpenERP Team"
 
 #. module: marketing_campaign_crm_demo
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Fehler ! Sie können keine rekursiven Verzeichnisse anlegen."
-
-#. module: marketing_campaign_crm_demo
-#: sql_constraint:marketing.campaign.transition:0
-msgid "The interval must be positive or zero"
-msgstr "Das Intervall muss positiv oder 0 sein"
-
-#. module: marketing_campaign_crm_demo
-#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
-msgid "Demo data for the module marketing_campaign."
-msgstr "Demodaten für das Modul marketing_campaign"
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
 msgid ""
-"Hello,Thanks for showing intrest and buying the OpenERP book.\n"
+"Hello,We have very good offer that might suit you.\n"
+"            We propose you to subscribe to the OpenERP Discovery Day on May "
+"2010.\n"
 "            If any further information required kindly revert back.\n"
-"            I really appreciate your co-operation on this.\n"
+"            We really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
-"Hallo, Danke für Ihre Interesse an unserem Produkt und den Kauf des OpenERP "
-"Buchs.\n"
-"            Wir stehen zu Ihrer Verfügung bei weiteren Anfragen Ihrerseits.\n"
-"            Wir würden uns freuen weitere Services zum Produkt anbieten zu "
-"dürfen.\n"
-"            Viele Grüsse , Ihr OpenERP Team"
-
-#. module: marketing_campaign_crm_demo
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
-msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
-msgstr "Vorschlag zur Anmeldung an OpenERP Tag der offenen Tür im Mai 2010"
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
-msgid "Propose paid training to Silver partners"
-msgstr ""
-"Vorschlag für Trainingsprogramm zur Erlangung des Status Silber Partner"
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
-msgid "Thanks for showing interest in OpenERP"
-msgstr "Danke für Ihr gezeigtes Interesse an OpenERP"
-
-#. module: marketing_campaign_crm_demo
-#: 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 !"
+"Hallo, wir können Ihnen erneut ein interessantes Angebot unterbreiten.\n"
+"            Wir empfehlen Ihnen unseren Tag der offenen Tür im Mai2010.\n"
+"            Wir würden uns über eine Anmeldung von Ihnen freuen.\n"
+"            Des weiteren freuen wir uns bereits auf ein persönliches "
+"Gespräch.            Viele Grüsse , Ihr OpenERP Team"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
@@ -93,21 +53,58 @@ msgid "Thanks for buying the OpenERP book"
 msgstr "Danke für den Einkauf des OpenERP Buchs"
 
 #. module: marketing_campaign_crm_demo
-#: constraint:marketing.campaign.transition:0
-msgid "The To/From Activity of transition must be of the same Campaign "
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  paid technical training on "
+"june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
 msgstr ""
-"Ein- und ausgehende Verbindungen müssen zur gleichen Kampagne gehören "
-
-#. module: marketing_campaign_crm_demo
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "Das Verzeichnis kann nicht sich selbst übergeordnet werden"
+"Hallo, wir können Ihnen ein exklusives Angebot unterbreiten.\n"
+"            Für alle Silberpartner bieten wir ein technisches Training "
+"imJuni 2010.\n"
+"            Wir würden uns freuen weitere Informationen diesbezüglich "
+"mitzuteilen.\n"
+"            Wir würden uns über Interesse Ihrerseits freuen.            "
+"Viele Grüsse , Ihr OpenERP Team"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
 msgid "Propose a free technical training to Gold partners"
 msgstr "Vorschlag für ein technisches Training zur Erlangung des Gold Status"
 
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
+msgid "Demo data for the module marketing_campaign."
+msgstr "Demodaten für das Modul marketing_campaign"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
+msgid "Thanks for subscribing to the OpenERP Discovery Day"
+msgstr "Danke für Ihre Anmeldung zum Tag der offenen Tür"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
+msgid "Dummy Action"
+msgstr "Dummy Aktion"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
+msgid "Thanks for showing interest in OpenERP"
+msgstr "Danke für Ihr gezeigtes Interesse an OpenERP"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
+msgid "marketing_campaign_crm_demo"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
+msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
+msgstr "Vorschlag zur Anmeldung an OpenERP Tag der offenen Tür im Mai 2010"
+
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_7
 msgid ""
@@ -126,42 +123,24 @@ msgstr ""
 "Viele Grüsse , Ihr OpenERP Team"
 
 #. module: marketing_campaign_crm_demo
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "Das Verzeichnis muss eindeutig sein"
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
+msgid "Propose gold partnership to silver partners"
+msgstr "Vorschlag der Gold Partnerschaft für Silber Partner"
 
 #. module: marketing_campaign_crm_demo
-#: report:crm.lead.demo:0
-msgid "Partner :"
-msgstr "Partner :"
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
 msgid ""
-"Hello, Thanks for showing intrest and for subscribing to technical "
-"training.If any further information required kindly revert back.I really "
-"appreciate your co-operation on this.\n"
+"Hello,Thanks for showing intrest and buying the OpenERP book.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
-"Hallo, vielen Dank für Ihre Anfrage und Ihre Anmeldung zum technischen "
-"Training. Bei Rückfragen kommen Sie bitte auf uns zu. Wir freuen uns auf "
-"eine erfolgreiche Zusammenarbeit mit Ihrem Unternehmen.\n"
-"            Viele Grüsse ,Ihr OpenERP Team"
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
-msgid "Thanks for subscribing to technical training"
-msgstr "Danke für Ihre Anmeldung zum technischen Training"
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
-msgid "Thanks for subscribing to the OpenERP Discovery Day"
-msgstr "Danke für Ihre Anmeldung zum Tag der offenen Tür"
-
-#. module: marketing_campaign_crm_demo
-#: sql_constraint:email.template:0
-msgid "The template name must be unique !"
-msgstr "Die Vorlage muss eindeutig sein !"
+"Hallo, Danke für Ihre Interesse an unserem Produkt und den Kauf des OpenERP "
+"Buchs.\n"
+"            Wir stehen zu Ihrer Verfügung bei weiteren Anfragen Ihrerseits.\n"
+"            Wir würden uns freuen weitere Services zum Produkt anbieten zu "
+"dürfen.\n"
+"            Viele Grüsse , Ihr OpenERP Team"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_5
@@ -197,63 +176,64 @@ msgstr ""
 "             Viele Grüsse ,Ihr OpenERP Team"
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
+msgid "Thanks for subscribing to technical training"
+msgstr "Danke für Ihre Anmeldung zum technischen Training"
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Partner :"
+msgstr "Partner :"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
 msgid ""
-"Hello,We have very good offer that might suit you.\n"
-"            We propose you to subscribe to the OpenERP Discovery Day on May "
-"2010.\n"
-"            If any further information required kindly revert back.\n"
-"            We really appreciate your co-operation on this.\n"
+"Hello, Thanks for showing intrest and for subscribing to technical "
+"training.If any further information required kindly revert back.I really "
+"appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
-"Hallo, wir können Ihnen erneut ein interessantes Angebot unterbreiten.\n"
-"            Wir empfehlen Ihnen unseren Tag der offenen Tür im Mai2010.\n"
-"            Wir würden uns über eine Anmeldung von Ihnen freuen.\n"
-"            Des weiteren freuen wir uns bereits auf ein persönliches "
-"Gespräch.            Viele Grüsse , Ihr OpenERP Team"
+"Hallo, vielen Dank für Ihre Anfrage und Ihre Anmeldung zum technischen "
+"Training. Bei Rückfragen kommen Sie bitte auf uns zu. Wir freuen uns auf "
+"eine erfolgreiche Zusammenarbeit mit Ihrem Unternehmen.\n"
+"            Viele Grüsse ,Ihr OpenERP Team"
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
-msgid ""
-"Hello, We have very good offer that might suit you.\n"
-"            For our silver partners,We are  paid technical training on "
-"june,2010.\n"
-"            If any further information required kindly revert back.\n"
-"            I really appreciate your co-operation on this.\n"
-"            Regards,OpenERP Team,"
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
+msgid "Propose paid training to Silver partners"
 msgstr ""
-"Hallo, wir können Ihnen ein exklusives Angebot unterbreiten.\n"
-"            Für alle Silberpartner bieten wir ein technisches Training "
-"imJuni 2010.\n"
-"            Wir würden uns freuen weitere Informationen diesbezüglich "
-"mitzuteilen.\n"
-"            Wir würden uns über Interesse Ihrerseits freuen.            "
-"Viele Grüsse , Ihr OpenERP Team"
+"Vorschlag für Trainingsprogramm zur Erlangung des Status Silber Partner"
 
-#. module: marketing_campaign_crm_demo
-#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
-msgid "Dummy Action"
-msgstr "Dummy Aktion"
+#~ msgid "Error! You can not create recursive Directories."
+#~ msgstr "Fehler ! Sie können keine rekursiven Verzeichnisse anlegen."
 
-#. module: marketing_campaign_crm_demo
-#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
-msgid "marketing_campaign_crm_demo"
-msgstr ""
+#~ msgid "Model of filter must be same as resource model of Campaign "
+#~ msgstr ""
+#~ "Das Modul für den Filter sollte der Ressource für diese Kampagne entsprechen "
 
-#. module: marketing_campaign_crm_demo
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr ""
-"Das Verzeichnis muss ein Hauptverzeichnis oder einen Speicher zugewiesen "
-"haben"
+#~ msgid "The template name must be unique !"
+#~ msgstr "Die Vorlage muss eindeutig sein !"
 
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
-msgid "Propose gold partnership to silver partners"
-msgstr "Vorschlag der Gold Partnerschaft für Silber Partner"
+#~ msgid "Directory must have a parent or a storage"
+#~ msgstr ""
+#~ "Das Verzeichnis muss ein Hauptverzeichnis oder einen Speicher zugewiesen "
+#~ "haben"
 
-#. module: marketing_campaign_crm_demo
-#: constraint:marketing.campaign.segment:0
-msgid "Model of filter must be same as resource model of Campaign "
-msgstr ""
-"Das Modul für den Filter sollte der Ressource für diese Kampagne entsprechen "
+#~ msgid "The interval must be positive or zero"
+#~ msgstr "Das Intervall muss positiv oder 0 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 "Directory cannot be parent of itself!"
+#~ msgstr "Das Verzeichnis kann nicht sich selbst übergeordnet werden"
+
+#~ msgid "The directory name must be unique !"
+#~ msgstr "Das Verzeichnis muss eindeutig sein"
+
+#~ msgid "The To/From Activity of transition must be of the same Campaign "
+#~ msgstr ""
+#~ "Ein- und ausgehende Verbindungen müssen zur gleichen Kampagne gehören "
diff --git a/addons/marketing_campaign_crm_demo/i18n/fr.po b/addons/marketing_campaign_crm_demo/i18n/fr.po
index f9c681886e5..7b217a6c724 100644
--- a/addons/marketing_campaign_crm_demo/i18n/fr.po
+++ b/addons/marketing_campaign_crm_demo/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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-30 12:19+0000\n"
 "Last-Translator: <>\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-10-30 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign_crm_demo
@@ -29,47 +29,30 @@ msgid ""
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
-msgid "Demo data for the module marketing_campaign."
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
 msgid ""
-"Hello,Thanks for showing intrest and buying the OpenERP book.\n"
+"Hello,We have very good offer that might suit you.\n"
+"            We propose you to subscribe to the OpenERP Discovery Day on May "
+"2010.\n"
 "            If any further information required kindly revert back.\n"
-"            I really appreciate your co-operation on this.\n"
+"            We really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
 
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
-msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
-msgid "Propose paid training to Silver partners"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
-msgid "Thanks for showing interest in OpenERP"
-msgstr ""
-
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
 msgid "Thanks for buying the OpenERP book"
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: constraint:marketing.campaign.transition:0
-msgid "The To/From Activity of transition must be of the same Campaign "
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  paid technical training on "
+"june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
@@ -77,6 +60,36 @@ msgstr ""
 msgid "Propose a free technical training to Gold partners"
 msgstr ""
 
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
+msgid "Demo data for the module marketing_campaign."
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
+msgid "Thanks for subscribing to the OpenERP Discovery Day"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
+msgid "Dummy Action"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
+msgid "Thanks for showing interest in OpenERP"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
+msgid "marketing_campaign_crm_demo"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
+msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
+msgstr ""
+
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_7
 msgid ""
@@ -88,29 +101,19 @@ msgid ""
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: report:crm.lead.demo:0
-msgid "Partner :"
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
+msgid "Propose gold partnership to silver partners"
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
 msgid ""
-"Hello, Thanks for showing intrest and for subscribing to technical "
-"training.If any further information required kindly revert back.I really "
-"appreciate your co-operation on this.\n"
+"Hello,Thanks for showing intrest and buying the OpenERP book.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
 
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
-msgid "Thanks for subscribing to technical training"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
-msgid "Thanks for subscribing to the OpenERP Discovery Day"
-msgstr ""
-
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_5
 msgid ""
@@ -133,43 +136,25 @@ msgid ""
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
+msgid "Thanks for subscribing to technical training"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Partner :"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
 msgid ""
-"Hello,We have very good offer that might suit you.\n"
-"            We propose you to subscribe to the OpenERP Discovery Day on May "
-"2010.\n"
-"            If any further information required kindly revert back.\n"
-"            We really appreciate your co-operation on this.\n"
+"Hello, Thanks for showing intrest and for subscribing to technical "
+"training.If any further information required kindly revert back.I really "
+"appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
-msgid ""
-"Hello, We have very good offer that might suit you.\n"
-"            For our silver partners,We are  paid technical training on "
-"june,2010.\n"
-"            If any further information required kindly revert back.\n"
-"            I really appreciate your co-operation on this.\n"
-"            Regards,OpenERP Team,"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
-msgid "Dummy Action"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
-msgid "marketing_campaign_crm_demo"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
-msgid "Propose gold partnership to silver partners"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: constraint:marketing.campaign.segment:0
-msgid "Model of filter must be same as resource model of Campaign "
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
+msgid "Propose paid training to Silver partners"
 msgstr ""
diff --git a/addons/marketing_campaign_crm_demo/i18n/it.po b/addons/marketing_campaign_crm_demo/i18n/it.po
index bf38442ce96..970ac7bb333 100644
--- a/addons/marketing_campaign_crm_demo/i18n/it.po
+++ b/addons/marketing_campaign_crm_demo/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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-29 10:19+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-10-30 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign_crm_demo
@@ -32,15 +32,82 @@ msgstr ""
 "Cordiali saluti, Il team OpenERP,"
 
 #. module: marketing_campaign_crm_demo
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Errore! Non puoi creare Direcroty ricorsive"
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
+msgid ""
+"Hello,We have very good offer that might suit you.\n"
+"            We propose you to subscribe to the OpenERP Discovery Day on May "
+"2010.\n"
+"            If any further information required kindly revert back.\n"
+"            We really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
+msgid "Thanks for buying the OpenERP book"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  paid technical training on "
+"june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
+msgid "Propose a free technical training to Gold partners"
+msgstr ""
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
 msgid "Demo data for the module marketing_campaign."
 msgstr "Dati demo per il modulo marketing_campaign"
 
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
+msgid "Thanks for subscribing to the OpenERP Discovery Day"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
+msgid "Dummy Action"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
+msgid "Thanks for showing interest in OpenERP"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
+msgid "marketing_campaign_crm_demo"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
+msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
+msgstr "Proposta di sottoscrizione all'OpenERP Discovery Day di Maggio 2010"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_7
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  offering Gold partnership.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
+msgid "Propose gold partnership to silver partners"
+msgstr ""
+
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
 msgid ""
@@ -55,70 +122,6 @@ msgstr ""
 "            apprezziamo veramente la vostra cooperazione su questo.\n"
 "            Cordiali saluti, Il team di OpenERP"
 
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
-msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
-msgstr "Proposta di sottoscrizione all'OpenERP Discovery Day di Maggio 2010"
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
-msgid "Propose paid training to Silver partners"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
-msgid "Thanks for showing interest in OpenERP"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
-msgid "Thanks for buying the OpenERP book"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: constraint:marketing.campaign.transition:0
-msgid "The To/From Activity of transition must be of the same Campaign "
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
-msgid "Propose a free technical training to Gold partners"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_7
-msgid ""
-"Hello, We have very good offer that might suit you.\n"
-"            For our silver partners,We are  offering Gold partnership.\n"
-"            If any further information required kindly revert back.\n"
-"            I really appreciate your co-operation on this.\n"
-"            Regards,OpenERP Team,"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: report:crm.lead.demo:0
-msgid "Partner :"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
-msgid ""
-"Hello, Thanks for showing intrest and for subscribing to technical "
-"training.If any further information required kindly revert back.I really "
-"appreciate your co-operation on this.\n"
-"            Regards,OpenERP Team,"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
-msgid "Thanks for subscribing to technical training"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
-msgid "Thanks for subscribing to the OpenERP Discovery Day"
-msgstr ""
-
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_5
 msgid ""
@@ -141,43 +144,28 @@ msgid ""
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
+msgid "Thanks for subscribing to technical training"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Partner :"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
 msgid ""
-"Hello,We have very good offer that might suit you.\n"
-"            We propose you to subscribe to the OpenERP Discovery Day on May "
-"2010.\n"
-"            If any further information required kindly revert back.\n"
-"            We really appreciate your co-operation on this.\n"
+"Hello, Thanks for showing intrest and for subscribing to technical "
+"training.If any further information required kindly revert back.I really "
+"appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
-msgid ""
-"Hello, We have very good offer that might suit you.\n"
-"            For our silver partners,We are  paid technical training on "
-"june,2010.\n"
-"            If any further information required kindly revert back.\n"
-"            I really appreciate your co-operation on this.\n"
-"            Regards,OpenERP Team,"
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
+msgid "Propose paid training to Silver partners"
 msgstr ""
 
-#. module: marketing_campaign_crm_demo
-#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
-msgid "Dummy Action"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
-msgid "marketing_campaign_crm_demo"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
-msgid "Propose gold partnership to silver partners"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: constraint:marketing.campaign.segment:0
-msgid "Model of filter must be same as resource model of Campaign "
-msgstr ""
+#~ msgid "Error! You can not create recursive Directories."
+#~ msgstr "Errore! Non puoi creare Direcroty ricorsive"
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/marketing_campaign_crm_demo/i18n/nl.po b/addons/marketing_campaign_crm_demo/i18n/nl.po
index d198863f06a..e0e246e944e 100644
--- a/addons/marketing_campaign_crm_demo/i18n/nl.po
+++ b/addons/marketing_campaign_crm_demo/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-10-18 07:49+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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign_crm_demo
@@ -32,59 +32,79 @@ msgstr ""
 "Groeten, OpenERP Team,"
 
 #. module: marketing_campaign_crm_demo
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Fout! U kunt geen recursieve mappen maken"
-
-#. module: marketing_campaign_crm_demo
-#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
-msgid "Demo data for the module marketing_campaign."
-msgstr "Demo gegevens voor de module marketing_campaign."
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
 msgid ""
-"Hello,Thanks for showing intrest and buying the OpenERP book.\n"
+"Hello,We have very good offer that might suit you.\n"
+"            We propose you to subscribe to the OpenERP Discovery Day on May "
+"2010.\n"
 "            If any further information required kindly revert back.\n"
-"            I really appreciate your co-operation on this.\n"
+"            We really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
-"Hallo,bedankt voor de getoonde interesse en het aanschaffen van het OpenERP "
-"boek.\n"
-"            Als er meer informatie nodig is dan graag terugkeren.\n"
+"Hallo, We hebben een erg mooie aanbieding die bij u kan passen.\n"
+"            We stellen voor om in te schrijven op de OpenERP Discovery Day "
+"in Mei 2010.\n"
+"            Als er meer informatie nodig is, dan graag terugkeren.\n"
 "            Ik waardeer uw medewerking hierbij.\n"
 "            Groeten,OpenERP Team,"
 
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
-msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
-msgstr "Stel inschrijven voor OpenERP Discovery Day in Mei 2010 voor"
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
-msgid "Propose paid training to Silver partners"
-msgstr "Stel betaalde training aan Zilver partners voor"
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
-msgid "Thanks for showing interest in OpenERP"
-msgstr "Bedankt voor getoonde interesse in OpenERP"
-
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
 msgid "Thanks for buying the OpenERP book"
 msgstr "Bedankt voor het aanschaffen van het OpenERP boek"
 
 #. module: marketing_campaign_crm_demo
-#: constraint:marketing.campaign.transition:0
-msgid "The To/From Activity of transition must be of the same Campaign "
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  paid technical training on "
+"june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
 msgstr ""
+"Hallo, We hebben een erg mooie aanbieding die bij u kan passen.\n"
+"            Voor onze zilver partners verzorgen we betaalde technische "
+"training in juni 2010.\n"
+"            Als er meer informatie nodig is, dan graag terugkeren.\n"
+"            Ik waardeer uw medewerking hierbij.\n"
+"            Groeten,OpenERP Team,"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
 msgid "Propose a free technical training to Gold partners"
 msgstr "Stel een gratis technische training aan Gold partners voor"
 
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
+msgid "Demo data for the module marketing_campaign."
+msgstr "Demo gegevens voor de module marketing_campaign."
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
+msgid "Thanks for subscribing to the OpenERP Discovery Day"
+msgstr "Bedankt voor het inschrijven op de OpenERP Discovery Day"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
+msgid "Dummy Action"
+msgstr "Dummy Actie"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
+msgid "Thanks for showing interest in OpenERP"
+msgstr "Bedankt voor getoonde interesse in OpenERP"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
+msgid "marketing_campaign_crm_demo"
+msgstr "marketing_campaign_crm_demo"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
+msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
+msgstr "Stel inschrijven voor OpenERP Discovery Day in Mei 2010 voor"
+
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_7
 msgid ""
@@ -101,33 +121,24 @@ msgstr ""
 "            Groeten,OpenERP Team,"
 
 #. module: marketing_campaign_crm_demo
-#: report:crm.lead.demo:0
-msgid "Partner :"
-msgstr "Relatie :"
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
+msgid "Propose gold partnership to silver partners"
+msgstr "Stel goud partnerschap voor aan zilver partners"
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
 msgid ""
-"Hello, Thanks for showing intrest and for subscribing to technical "
-"training.If any further information required kindly revert back.I really "
-"appreciate your co-operation on this.\n"
+"Hello,Thanks for showing intrest and buying the OpenERP book.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
-"Hallo, bedankt voor de getoonde interessen en voor de inschrijving voor de "
-"technische training. Als er meer informatie nodig is dan graag terugkeren.Ik "
-"waardeer uw medewerking hierin.\n"
+"Hallo,bedankt voor de getoonde interesse en het aanschaffen van het OpenERP "
+"boek.\n"
+"            Als er meer informatie nodig is dan graag terugkeren.\n"
+"            Ik waardeer uw medewerking hierbij.\n"
 "            Groeten,OpenERP Team,"
 
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
-msgid "Thanks for subscribing to technical training"
-msgstr "Bedankt voor het inschrijven voor de techniche training"
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
-msgid "Thanks for subscribing to the OpenERP Discovery Day"
-msgstr "Bedankt voor het inschrijven op de OpenERP Discovery Day"
-
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_5
 msgid ""
@@ -161,58 +172,35 @@ msgstr ""
 "             Groeten,OpenERP Team,"
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
+msgid "Thanks for subscribing to technical training"
+msgstr "Bedankt voor het inschrijven voor de techniche training"
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Partner :"
+msgstr "Relatie :"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
 msgid ""
-"Hello,We have very good offer that might suit you.\n"
-"            We propose you to subscribe to the OpenERP Discovery Day on May "
-"2010.\n"
-"            If any further information required kindly revert back.\n"
-"            We really appreciate your co-operation on this.\n"
+"Hello, Thanks for showing intrest and for subscribing to technical "
+"training.If any further information required kindly revert back.I really "
+"appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
-"Hallo, We hebben een erg mooie aanbieding die bij u kan passen.\n"
-"            We stellen voor om in te schrijven op de OpenERP Discovery Day "
-"in Mei 2010.\n"
-"            Als er meer informatie nodig is, dan graag terugkeren.\n"
-"            Ik waardeer uw medewerking hierbij.\n"
+"Hallo, bedankt voor de getoonde interessen en voor de inschrijving voor de "
+"technische training. Als er meer informatie nodig is dan graag terugkeren.Ik "
+"waardeer uw medewerking hierin.\n"
 "            Groeten,OpenERP Team,"
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
-msgid ""
-"Hello, We have very good offer that might suit you.\n"
-"            For our silver partners,We are  paid technical training on "
-"june,2010.\n"
-"            If any further information required kindly revert back.\n"
-"            I really appreciate your co-operation on this.\n"
-"            Regards,OpenERP Team,"
-msgstr ""
-"Hallo, We hebben een erg mooie aanbieding die bij u kan passen.\n"
-"            Voor onze zilver partners verzorgen we betaalde technische "
-"training in juni 2010.\n"
-"            Als er meer informatie nodig is, dan graag terugkeren.\n"
-"            Ik waardeer uw medewerking hierbij.\n"
-"            Groeten,OpenERP Team,"
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
+msgid "Propose paid training to Silver partners"
+msgstr "Stel betaalde training aan Zilver partners voor"
 
-#. module: marketing_campaign_crm_demo
-#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
-msgid "Dummy Action"
-msgstr "Dummy Actie"
-
-#. module: marketing_campaign_crm_demo
-#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
-msgid "marketing_campaign_crm_demo"
-msgstr "marketing_campaign_crm_demo"
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
-msgid "Propose gold partnership to silver partners"
-msgstr "Stel goud partnerschap voor aan zilver partners"
-
-#. module: marketing_campaign_crm_demo
-#: constraint:marketing.campaign.segment:0
-msgid "Model of filter must be same as resource model of Campaign "
-msgstr ""
+#~ msgid "Error! You can not create recursive Directories."
+#~ msgstr "Fout! U kunt geen recursieve mappen maken"
 
 #~ msgid "Company :"
 #~ msgstr "Bedrijf :"
diff --git a/addons/marketing_campaign_crm_demo/i18n/pt.po b/addons/marketing_campaign_crm_demo/i18n/pt.po
index cb5e0b91042..6cedd574480 100644
--- a/addons/marketing_campaign_crm_demo/i18n/pt.po
+++ b/addons/marketing_campaign_crm_demo/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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign_crm_demo
diff --git a/addons/marketing_campaign_crm_demo/i18n/ru.po b/addons/marketing_campaign_crm_demo/i18n/ru.po
index 47879ff2bfc..3c9831ba8a3 100644
--- a/addons/marketing_campaign_crm_demo/i18n/ru.po
+++ b/addons/marketing_campaign_crm_demo/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-30 06:47+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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign_crm_demo
@@ -30,9 +30,36 @@ msgid ""
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Ошибка! Вы не можете созадавать вложенные директории."
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
+msgid ""
+"Hello,We have very good offer that might suit you.\n"
+"            We propose you to subscribe to the OpenERP Discovery Day on May "
+"2010.\n"
+"            If any further information required kindly revert back.\n"
+"            We really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
+msgid "Thanks for buying the OpenERP book"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  paid technical training on "
+"june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
+msgid "Propose a free technical training to Gold partners"
+msgstr ""
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
@@ -42,22 +69,13 @@ msgstr ""
 "кампания)."
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
-msgid ""
-"Hello,Thanks for showing intrest and buying the OpenERP book.\n"
-"            If any further information required kindly revert back.\n"
-"            I really appreciate your co-operation on this.\n"
-"            Regards,OpenERP Team,"
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
+msgid "Thanks for subscribing to the OpenERP Discovery Day"
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
-msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
-msgid "Propose paid training to Silver partners"
+#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
+msgid "Dummy Action"
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
@@ -66,18 +84,13 @@ msgid "Thanks for showing interest in OpenERP"
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
-msgid "Thanks for buying the OpenERP book"
+#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
+msgid "marketing_campaign_crm_demo"
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: constraint:marketing.campaign.transition:0
-msgid "The To/From Activity of transition must be of the same Campaign "
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
-msgid "Propose a free technical training to Gold partners"
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
+msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
@@ -91,29 +104,19 @@ msgid ""
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: report:crm.lead.demo:0
-msgid "Partner :"
-msgstr "Партнер:"
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
+msgid "Propose gold partnership to silver partners"
+msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
 msgid ""
-"Hello, Thanks for showing intrest and for subscribing to technical "
-"training.If any further information required kindly revert back.I really "
-"appreciate your co-operation on this.\n"
+"Hello,Thanks for showing intrest and buying the OpenERP book.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
 
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
-msgid "Thanks for subscribing to technical training"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
-msgid "Thanks for subscribing to the OpenERP Discovery Day"
-msgstr ""
-
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_5
 msgid ""
@@ -136,46 +139,31 @@ msgid ""
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
+msgid "Thanks for subscribing to technical training"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Partner :"
+msgstr "Партнер:"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
 msgid ""
-"Hello,We have very good offer that might suit you.\n"
-"            We propose you to subscribe to the OpenERP Discovery Day on May "
-"2010.\n"
-"            If any further information required kindly revert back.\n"
-"            We really appreciate your co-operation on this.\n"
+"Hello, Thanks for showing intrest and for subscribing to technical "
+"training.If any further information required kindly revert back.I really "
+"appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
-msgid ""
-"Hello, We have very good offer that might suit you.\n"
-"            For our silver partners,We are  paid technical training on "
-"june,2010.\n"
-"            If any further information required kindly revert back.\n"
-"            I really appreciate your co-operation on this.\n"
-"            Regards,OpenERP Team,"
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
+msgid "Propose paid training to Silver partners"
 msgstr ""
 
-#. module: marketing_campaign_crm_demo
-#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
-msgid "Dummy Action"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
-msgid "marketing_campaign_crm_demo"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
-msgid "Propose gold partnership to silver partners"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: constraint:marketing.campaign.segment:0
-msgid "Model of filter must be same as resource model of Campaign "
-msgstr ""
+#~ msgid "Error! You can not create recursive Directories."
+#~ msgstr "Ошибка! Вы не можете созадавать вложенные директории."
 
 #~ msgid "Company :"
 #~ msgstr "Компания:"
diff --git a/addons/marketing_campaign_crm_demo/i18n/sr.po b/addons/marketing_campaign_crm_demo/i18n/sr.po
index df954e4a52a..3365bd707ff 100644
--- a/addons/marketing_campaign_crm_demo/i18n/sr.po
+++ b/addons/marketing_campaign_crm_demo/i18n/sr.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-04 09:06+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-06 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign_crm_demo
@@ -32,43 +32,15 @@ msgstr ""
 "OpenERP Tim."
 
 #. module: marketing_campaign_crm_demo
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
-msgid "Demo data for the module marketing_campaign."
-msgstr "Greska ! Ne mozes kreirati rekursivne direktorijume."
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
 msgid ""
-"Hello,Thanks for showing intrest and buying the OpenERP book.\n"
+"Hello,We have very good offer that might suit you.\n"
+"            We propose you to subscribe to the OpenERP Discovery Day on May "
+"2010.\n"
 "            If any further information required kindly revert back.\n"
-"            I really appreciate your co-operation on this.\n"
+"            We really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
-"Pozdrav. Hvala za pokazani interes i kupovinu OpenERP Knjige,\n"
-"       Ako vam je nadalkje potrebna bilo koja informacija bice nam drago da "
-"vam pomognemo.\n"
-"       Veoma cenimo vasu kooperativnost ,\n"
-"       Srdacni pozdrav, OPenERP Tim."
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
-msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
-msgstr "Predlog za upis na OpenERP prezentaciju nekog dana u maju 2010"
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
-msgid "Propose paid training to Silver partners"
-msgstr "Predlog da platite obiku za Srebrnog partnera"
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
-msgid "Thanks for showing interest in OpenERP"
-msgstr "Hvala za pokazano interesovanje za OpenERP"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
@@ -76,15 +48,51 @@ msgid "Thanks for buying the OpenERP book"
 msgstr "Hvala sto ste kupili OPenERP Knjigu"
 
 #. module: marketing_campaign_crm_demo
-#: constraint:marketing.campaign.transition:0
-msgid "The To/From Activity of transition must be of the same Campaign "
-msgstr "Za / Od Aktivnosti tranzicije moraju biti iz iste kampanje "
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  paid technical training on "
+"june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
 msgid "Propose a free technical training to Gold partners"
 msgstr "Predlog za besplatnu tehnicku pomoc za Zlatnog Partnera"
 
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
+msgid "Demo data for the module marketing_campaign."
+msgstr "Greska ! Ne mozes kreirati rekursivne direktorijume."
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
+msgid "Thanks for subscribing to the OpenERP Discovery Day"
+msgstr "Hvala sto ste se upisali na OpenERP prezentaciju"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
+msgid "Dummy Action"
+msgstr "Dummy Akcija"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
+msgid "Thanks for showing interest in OpenERP"
+msgstr "Hvala za pokazano interesovanje za OpenERP"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
+msgid "marketing_campaign_crm_demo"
+msgstr "marketing_campaign_crm_demo"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
+msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
+msgstr "Predlog za upis na OpenERP prezentaciju nekog dana u maju 2010"
+
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_7
 msgid ""
@@ -102,32 +110,23 @@ msgstr ""
 "          Srdacni POzdrav, OPenERP TIM,"
 
 #. module: marketing_campaign_crm_demo
-#: report:crm.lead.demo:0
-msgid "Partner :"
-msgstr "Partner :"
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
+msgid "Propose gold partnership to silver partners"
+msgstr "Predlazemo zlatno"
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
 msgid ""
-"Hello, Thanks for showing intrest and for subscribing to technical "
-"training.If any further information required kindly revert back.I really "
-"appreciate your co-operation on this.\n"
+"Hello,Thanks for showing intrest and buying the OpenERP book.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
-"Pozdrav, HVala sto pokazujete interesovanjke i za upis za tehnicku pomoc, Za "
-"svaku buducu informaciju ce mo vam rado izaci u susret, Veoma cenimo vasu "
-"kooperativnost na ovom projektu.\n"
-"                                      Sradcni POzdrav, OpenERP TIM."
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
-msgid "Thanks for subscribing to technical training"
-msgstr "Hvala za prijavu za tehnicku obuku"
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
-msgid "Thanks for subscribing to the OpenERP Discovery Day"
-msgstr "Hvala sto ste se upisali na OpenERP prezentaciju"
+"Pozdrav. Hvala za pokazani interes i kupovinu OpenERP Knjige,\n"
+"       Ako vam je nadalkje potrebna bilo koja informacija bice nam drago da "
+"vam pomognemo.\n"
+"       Veoma cenimo vasu kooperativnost ,\n"
+"       Srdacni pozdrav, OPenERP Tim."
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_5
@@ -151,43 +150,35 @@ msgid ""
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
+msgid "Thanks for subscribing to technical training"
+msgstr "Hvala za prijavu za tehnicku obuku"
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Partner :"
+msgstr "Partner :"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
 msgid ""
-"Hello,We have very good offer that might suit you.\n"
-"            We propose you to subscribe to the OpenERP Discovery Day on May "
-"2010.\n"
-"            If any further information required kindly revert back.\n"
-"            We really appreciate your co-operation on this.\n"
+"Hello, Thanks for showing intrest and for subscribing to technical "
+"training.If any further information required kindly revert back.I really "
+"appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Pozdrav, HVala sto pokazujete interesovanjke i za upis za tehnicku pomoc, Za "
+"svaku buducu informaciju ce mo vam rado izaci u susret, Veoma cenimo vasu "
+"kooperativnost na ovom projektu.\n"
+"                                      Sradcni POzdrav, OpenERP TIM."
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
-msgid ""
-"Hello, We have very good offer that might suit you.\n"
-"            For our silver partners,We are  paid technical training on "
-"june,2010.\n"
-"            If any further information required kindly revert back.\n"
-"            I really appreciate your co-operation on this.\n"
-"            Regards,OpenERP Team,"
-msgstr ""
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
+msgid "Propose paid training to Silver partners"
+msgstr "Predlog da platite obiku za Srebrnog partnera"
 
-#. module: marketing_campaign_crm_demo
-#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
-msgid "Dummy Action"
-msgstr "Dummy Akcija"
+#~ msgid "The To/From Activity of transition must be of the same Campaign "
+#~ msgstr "Za / Od Aktivnosti tranzicije moraju biti iz iste kampanje "
 
-#. module: marketing_campaign_crm_demo
-#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
-msgid "marketing_campaign_crm_demo"
-msgstr "marketing_campaign_crm_demo"
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
-msgid "Propose gold partnership to silver partners"
-msgstr "Predlazemo zlatno"
-
-#. module: marketing_campaign_crm_demo
-#: constraint:marketing.campaign.segment:0
-msgid "Model of filter must be same as resource model of Campaign "
-msgstr "Model filtera mora biti isti kao resurs modela Kampanje "
+#~ msgid "Model of filter must be same as resource model of Campaign "
+#~ msgstr "Model filtera mora biti isti kao resurs modela Kampanje "
diff --git a/addons/marketing_campaign_crm_demo/i18n/sr@latin.po b/addons/marketing_campaign_crm_demo/i18n/sr@latin.po
index 4d9ce53aa85..c39ec204c59 100644
--- a/addons/marketing_campaign_crm_demo/i18n/sr@latin.po
+++ b/addons/marketing_campaign_crm_demo/i18n/sr@latin.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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign_crm_demo
diff --git a/addons/membership/i18n/ar.po b/addons/membership/i18n/ar.po
index d8dcaa8dc18..327f1584546 100644
--- a/addons/membership/i18n/ar.po
+++ b/addons/membership/i18n/ar.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/bg.po b/addons/membership/i18n/bg.po
index 9fd3f76387a..d74f627dd0c 100644
--- a/addons/membership/i18n/bg.po
+++ b/addons/membership/i18n/bg.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/bs.po b/addons/membership/i18n/bs.po
index 687e4cb6128..3447f0b852b 100644
--- a/addons/membership/i18n/bs.po
+++ b/addons/membership/i18n/bs.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/ca.po b/addons/membership/i18n/ca.po
index 9e6a66615ca..d65b79186f6 100644
--- a/addons/membership/i18n/ca.po
+++ b/addons/membership/i18n/ca.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/cs.po b/addons/membership/i18n/cs.po
index 323f5d90d8b..3b295f7346f 100644
--- a/addons/membership/i18n/cs.po
+++ b/addons/membership/i18n/cs.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/de.po b/addons/membership/i18n/de.po
index bb31169695c..f73335aac57 100644
--- a/addons/membership/i18n/de.po
+++ b/addons/membership/i18n/de.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/es.po b/addons/membership/i18n/es.po
index c1c1e6ec0ca..2069e08155c 100644
--- a/addons/membership/i18n/es.po
+++ b/addons/membership/i18n/es.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/es_AR.po b/addons/membership/i18n/es_AR.po
index 2269c2c2e71..e5b6fac7f5f 100644
--- a/addons/membership/i18n/es_AR.po
+++ b/addons/membership/i18n/es_AR.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-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/et.po b/addons/membership/i18n/et.po
index 8ba3754c16d..6086f47ccbc 100644
--- a/addons/membership/i18n/et.po
+++ b/addons/membership/i18n/et.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/fi.po b/addons/membership/i18n/fi.po
index fab2f31d515..271904981c6 100644
--- a/addons/membership/i18n/fi.po
+++ b/addons/membership/i18n/fi.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/fr.po b/addons/membership/i18n/fr.po
index a1f00270533..cbefccd404a 100644
--- a/addons/membership/i18n/fr.po
+++ b/addons/membership/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:15+0000\n"
-"PO-Revision-Date: 2010-12-12 08:32+0000\n"
-"Last-Translator: swinter <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 02: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-14 05:02+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/gl.po b/addons/membership/i18n/gl.po
index bb2535192a4..a1ba4cb1e92 100644
--- a/addons/membership/i18n/gl.po
+++ b/addons/membership/i18n/gl.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-12 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/hr.po b/addons/membership/i18n/hr.po
index d8dcaa8dc18..327f1584546 100644
--- a/addons/membership/i18n/hr.po
+++ b/addons/membership/i18n/hr.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/hu.po b/addons/membership/i18n/hu.po
index 79a3f1f7563..b882131049a 100644
--- a/addons/membership/i18n/hu.po
+++ b/addons/membership/i18n/hu.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/id.po b/addons/membership/i18n/id.po
index 65fc6a6b120..767fbe27b3c 100644
--- a/addons/membership/i18n/id.po
+++ b/addons/membership/i18n/id.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/it.po b/addons/membership/i18n/it.po
index 504f399d870..7d776601b4e 100644
--- a/addons/membership/i18n/it.po
+++ b/addons/membership/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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/ko.po b/addons/membership/i18n/ko.po
index 0275ec6319e..97d3e6c1a54 100644
--- a/addons/membership/i18n/ko.po
+++ b/addons/membership/i18n/ko.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/lt.po b/addons/membership/i18n/lt.po
index b8fcb05a393..cba67f40fbe 100644
--- a/addons/membership/i18n/lt.po
+++ b/addons/membership/i18n/lt.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+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/i18n/mn.po b/addons/membership/i18n/mn.po
index deeacc1fd4e..fd9bf1475f7 100644
--- a/addons/membership/i18n/mn.po
+++ b/addons/membership/i18n/mn.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/nl.po b/addons/membership/i18n/nl.po
index f5456e308a6..61e27d14166 100644
--- a/addons/membership/i18n/nl.po
+++ b/addons/membership/i18n/nl.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/nl_BE.po b/addons/membership/i18n/nl_BE.po
index 156d01ca9dc..10c0769dddb 100644
--- a/addons/membership/i18n/nl_BE.po
+++ b/addons/membership/i18n/nl_BE.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-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/pl.po b/addons/membership/i18n/pl.po
index 3490967984b..c4be8aa8c48 100644
--- a/addons/membership/i18n/pl.po
+++ b/addons/membership/i18n/pl.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/pt.po b/addons/membership/i18n/pt.po
index c438378fca9..53730ed0ba2 100644
--- a/addons/membership/i18n/pt.po
+++ b/addons/membership/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-14 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/pt_BR.po b/addons/membership/i18n/pt_BR.po
index 8f5544f8a48..7e20ede5ed2 100644
--- a/addons/membership/i18n/pt_BR.po
+++ b/addons/membership/i18n/pt_BR.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-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/ro.po b/addons/membership/i18n/ro.po
index 3a8daa4c38b..9de2f7d2550 100644
--- a/addons/membership/i18n/ro.po
+++ b/addons/membership/i18n/ro.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/ru.po b/addons/membership/i18n/ru.po
index 1328fd06715..25e024f56e0 100644
--- a/addons/membership/i18n/ru.po
+++ b/addons/membership/i18n/ru.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/sk.po b/addons/membership/i18n/sk.po
index c11a34bf3cb..a950d1ec21b 100644
--- a/addons/membership/i18n/sk.po
+++ b/addons/membership/i18n/sk.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/sl.po b/addons/membership/i18n/sl.po
index ad1480a13b6..779104b98d9 100644
--- a/addons/membership/i18n/sl.po
+++ b/addons/membership/i18n/sl.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/sq.po b/addons/membership/i18n/sq.po
index bb73a4f55ee..2da501acb00 100644
--- a/addons/membership/i18n/sq.po
+++ b/addons/membership/i18n/sq.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/sr@latin.po b/addons/membership/i18n/sr@latin.po
index aafcd28007e..479e5b00fd1 100644
--- a/addons/membership/i18n/sr@latin.po
+++ b/addons/membership/i18n/sr@latin.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-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/sv.po b/addons/membership/i18n/sv.po
index 7526ba21bee..d502f6acbf3 100644
--- a/addons/membership/i18n/sv.po
+++ b/addons/membership/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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/tlh.po b/addons/membership/i18n/tlh.po
index 1f09338b86c..5e20b7b4cb9 100644
--- a/addons/membership/i18n/tlh.po
+++ b/addons/membership/i18n/tlh.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/tr.po b/addons/membership/i18n/tr.po
index 7bc1af2c352..d013a763097 100644
--- a/addons/membership/i18n/tr.po
+++ b/addons/membership/i18n/tr.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-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/uk.po b/addons/membership/i18n/uk.po
index 565d3e952bd..f0aef39929d 100644
--- a/addons/membership/i18n/uk.po
+++ b/addons/membership/i18n/uk.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-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/vi.po b/addons/membership/i18n/vi.po
index 39423788d68..3278aa125de 100644
--- a/addons/membership/i18n/vi.po
+++ b/addons/membership/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-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/zh_CN.po b/addons/membership/i18n/zh_CN.po
index 968f9c5d10f..bc7d98307b3 100644
--- a/addons/membership/i18n/zh_CN.po
+++ b/addons/membership/i18n/zh_CN.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-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/zh_TW.po b/addons/membership/i18n/zh_TW.po
index 87c5ebf49d5..fff5cee5cda 100644
--- a/addons/membership/i18n/zh_TW.po
+++ b/addons/membership/i18n/zh_TW.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-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
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/ar.po b/addons/mrp/i18n/ar.po
index 27b75efdd58..a9658d77554 100644
--- a/addons/mrp/i18n/ar.po
+++ b/addons/mrp/i18n/ar.po
@@ -6,19 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
 msgstr ""
 
 #. module: mrp
@@ -47,9 +48,8 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
 msgstr ""
 
 #. module: mrp
@@ -57,11 +57,6 @@ msgstr ""
 msgid "Manufacturing Resource Planning"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -172,6 +160,15 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allows you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -182,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -218,13 +210,10 @@ msgid "UOM"
 msgstr ""
 
 #. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bills of materials."
 msgstr ""
 
 #. module: mrp
@@ -298,31 +287,11 @@ msgstr ""
 msgid "Scheduled goods"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid ""
-"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None, context=None):\n"
-"        if default is None:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -333,6 +302,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -366,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -454,12 +427,6 @@ msgstr ""
 msgid "Product type is service"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "of "
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
@@ -507,6 +474,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -581,13 +553,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -612,6 +577,13 @@ msgstr ""
 msgid "Time before prod."
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -705,6 +677,12 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost of "
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
@@ -722,6 +700,17 @@ msgstr ""
 msgid "Couldn't find bill of material for product"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of material in "
+"order to manufacture a product, when you have different ways of building the "
+"same product. You can assign several properties to each Bill of Materials. "
+"When a sales person creates a sales order, he can relate it to several "
+"properties and OpenERP will select automatically the BoM to use according "
+"the the needs."
+msgstr ""
+
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
@@ -793,6 +782,14 @@ msgstr ""
 msgid "Manufacturing Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials Components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM is used a "
+"specific component."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
@@ -867,6 +864,11 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr ""
+
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
@@ -960,11 +962,6 @@ msgstr ""
 msgid "Make to stock"
 msgstr ""
 
-#. module: mrp
-#: view:board.board:0
-msgid "Work Center Future load"
-msgstr ""
-
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
@@ -1044,11 +1041,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1059,6 +1051,17 @@ msgstr ""
 msgid "Manufacturing Orders in Progress"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each stage of production. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP becomes capable of automatically "
+"deciding on the manufacturing route depending on the needs of the company."
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
@@ -1094,7 +1097,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
-#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 msgid "Resources"
 msgstr ""
 
@@ -1105,7 +1107,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
 msgstr ""
@@ -1122,6 +1124,16 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
@@ -1162,10 +1174,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1196,6 +1208,16 @@ msgstr ""
 msgid "Revisions"
 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."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,priority:0
 #: field:mrp.production.order,priority:0
@@ -1285,6 +1307,14 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allows you to create and manage manufacturing units consisting "
+"of one or several people and/or machines that can be considered as a unit "
+"for capacity and planning forecasting."
+msgstr ""
+
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:0
 #, python-format
@@ -1307,22 +1337,11 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1333,12 +1352,6 @@ msgstr ""
 msgid "Product Consumed"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Work Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1372,8 +1385,11 @@ msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "'Minimum stock rule' material"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp
@@ -1407,6 +1423,12 @@ msgstr ""
 msgid "SO Number"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component Cost of "
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -1427,9 +1449,9 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
 msgstr ""
 
 #. module: mrp
@@ -1444,6 +1466,12 @@ msgstr ""
 msgid "Manufacturing Orders To Start"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
@@ -1524,6 +1552,7 @@ msgid "Make to Order"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
 msgstr ""
@@ -1597,12 +1626,6 @@ msgstr ""
 msgid "Production Products Consommation"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Total Cost "
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
@@ -1679,7 +1702,6 @@ msgid "Time for 1 cycle (hour)"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1756,6 +1778,14 @@ msgstr ""
 msgid "Valid Until"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
@@ -1766,6 +1796,18 @@ msgstr ""
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -1777,6 +1819,13 @@ msgstr ""
 msgid "Work Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
@@ -1952,6 +2001,7 @@ msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
 msgstr ""
@@ -1993,6 +2043,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2025,6 +2080,22 @@ msgstr ""
 msgid "Productions"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bill of Materials allows you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoM in order to propose automatically manufacturing orders according "
+"to products' needs. You can either create a bill of materials to define "
+"specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2048,6 +2119,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2059,6 +2135,11 @@ msgstr ""
 msgid "Procurements in Exception"
 msgstr ""
 
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
@@ -2117,6 +2198,14 @@ msgstr ""
 msgid "Scheduled End Date"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
diff --git a/addons/mrp/i18n/bg.po b/addons/mrp/i18n/bg.po
index 704fcf62684..a7cc9138bd1 100644
--- a/addons/mrp/i18n/bg.po
+++ b/addons/mrp/i18n/bg.po
@@ -6,20 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 07:29+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@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-10-30 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
-msgstr ""
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Създадени движения"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -47,21 +48,15 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
-msgstr "Създадени движения"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
 msgstr "Планиране на ресурси за производство"
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Невалидно име на модел при задаване на действие"
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -172,6 +160,15 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allows you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -182,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -218,13 +210,10 @@ msgid "UOM"
 msgstr ""
 
 #. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bills of materials."
 msgstr ""
 
 #. module: mrp
@@ -298,31 +287,11 @@ msgstr ""
 msgid "Scheduled goods"
 msgstr "Планирани стоки"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid ""
-"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None, context=None):\n"
-"        if default is None:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -333,6 +302,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -366,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -454,12 +427,6 @@ msgstr ""
 msgid "Product type is service"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "of "
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
@@ -507,6 +474,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -581,13 +553,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -612,6 +577,13 @@ msgstr ""
 msgid "Time before prod."
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -705,6 +677,12 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost of "
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
@@ -722,6 +700,17 @@ msgstr ""
 msgid "Couldn't find bill of material for product"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of material in "
+"order to manufacture a product, when you have different ways of building the "
+"same product. You can assign several properties to each Bill of Materials. "
+"When a sales person creates a sales order, he can relate it to several "
+"properties and OpenERP will select automatically the BoM to use according "
+"the the needs."
+msgstr ""
+
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
@@ -793,6 +782,14 @@ msgstr ""
 msgid "Manufacturing Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials Components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM is used a "
+"specific component."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
@@ -867,6 +864,11 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr ""
+
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
@@ -960,11 +962,6 @@ msgstr ""
 msgid "Make to stock"
 msgstr ""
 
-#. module: mrp
-#: view:board.board:0
-msgid "Work Center Future load"
-msgstr ""
-
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
@@ -1044,11 +1041,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1059,6 +1051,17 @@ msgstr ""
 msgid "Manufacturing Orders in Progress"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each stage of production. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP becomes capable of automatically "
+"deciding on the manufacturing route depending on the needs of the company."
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
@@ -1094,7 +1097,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
-#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 msgid "Resources"
 msgstr ""
 
@@ -1105,7 +1107,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
 msgstr ""
@@ -1122,6 +1124,16 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
@@ -1162,10 +1174,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1196,6 +1208,16 @@ msgstr ""
 msgid "Revisions"
 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."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,priority:0
 #: field:mrp.production.order,priority:0
@@ -1285,6 +1307,14 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allows you to create and manage manufacturing units consisting "
+"of one or several people and/or machines that can be considered as a unit "
+"for capacity and planning forecasting."
+msgstr ""
+
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:0
 #, python-format
@@ -1307,22 +1337,11 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1333,12 +1352,6 @@ msgstr ""
 msgid "Product Consumed"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Work Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1372,8 +1385,11 @@ msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "'Minimum stock rule' material"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp
@@ -1407,6 +1423,12 @@ msgstr ""
 msgid "SO Number"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component Cost of "
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -1427,12 +1449,10 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
 msgstr ""
-"Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-"символи!"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1446,6 +1466,12 @@ msgstr ""
 msgid "Manufacturing Orders To Start"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
@@ -1526,6 +1552,7 @@ msgid "Make to Order"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
 msgstr ""
@@ -1599,12 +1626,6 @@ msgstr ""
 msgid "Production Products Consommation"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Total Cost "
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
@@ -1681,7 +1702,6 @@ msgid "Time for 1 cycle (hour)"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1758,6 +1778,14 @@ msgstr ""
 msgid "Valid Until"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
@@ -1768,6 +1796,18 @@ msgstr ""
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -1779,6 +1819,13 @@ msgstr ""
 msgid "Work Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
@@ -1954,6 +2001,7 @@ msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
 msgstr ""
@@ -1995,6 +2043,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2027,6 +2080,22 @@ msgstr ""
 msgid "Productions"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bill of Materials allows you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoM in order to propose automatically manufacturing orders according "
+"to products' needs. You can either create a bill of materials to define "
+"specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2050,6 +2119,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2061,6 +2135,11 @@ msgstr ""
 msgid "Procurements in Exception"
 msgstr ""
 
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
@@ -2119,6 +2198,14 @@ msgstr ""
 msgid "Scheduled End Date"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
@@ -2219,6 +2306,15 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Невалиден XML за преглед на архитектурата"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
+#~ "символи!"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Изчисляване на правила за минимално правило за количество"
 
@@ -2253,6 +2349,9 @@ msgstr ""
 #~ msgid "Stockable Production Order"
 #~ msgstr "Скадируема поръчка за производство"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Невалидно име на модел при задаване на действие"
+
 #~ msgid "Routing Workcenters"
 #~ msgstr "Маршрутизиране на цехове"
 
diff --git a/addons/mrp/i18n/bs.po b/addons/mrp/i18n/bs.po
index 8f7abe56581..c09689bac87 100644
--- a/addons/mrp/i18n/bs.po
+++ b/addons/mrp/i18n/bs.po
@@ -6,19 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-02-03 19:45+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-10-30 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
 msgstr ""
 
 #. module: mrp
@@ -47,9 +48,8 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
 msgstr ""
 
 #. module: mrp
@@ -57,11 +57,6 @@ msgstr ""
 msgid "Manufacturing Resource Planning"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -172,6 +160,15 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allows you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -182,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -218,13 +210,10 @@ msgid "UOM"
 msgstr ""
 
 #. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bills of materials."
 msgstr ""
 
 #. module: mrp
@@ -298,31 +287,11 @@ msgstr ""
 msgid "Scheduled goods"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid ""
-"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None, context=None):\n"
-"        if default is None:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -333,6 +302,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -366,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -454,12 +427,6 @@ msgstr ""
 msgid "Product type is service"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "of "
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
@@ -507,6 +474,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -581,13 +553,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -612,6 +577,13 @@ msgstr ""
 msgid "Time before prod."
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -705,6 +677,12 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost of "
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
@@ -722,6 +700,17 @@ msgstr ""
 msgid "Couldn't find bill of material for product"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of material in "
+"order to manufacture a product, when you have different ways of building the "
+"same product. You can assign several properties to each Bill of Materials. "
+"When a sales person creates a sales order, he can relate it to several "
+"properties and OpenERP will select automatically the BoM to use according "
+"the the needs."
+msgstr ""
+
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
@@ -793,6 +782,14 @@ msgstr ""
 msgid "Manufacturing Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials Components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM is used a "
+"specific component."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
@@ -867,6 +864,11 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr ""
+
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
@@ -960,11 +962,6 @@ msgstr ""
 msgid "Make to stock"
 msgstr ""
 
-#. module: mrp
-#: view:board.board:0
-msgid "Work Center Future load"
-msgstr ""
-
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
@@ -1044,11 +1041,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1059,6 +1051,17 @@ msgstr ""
 msgid "Manufacturing Orders in Progress"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each stage of production. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP becomes capable of automatically "
+"deciding on the manufacturing route depending on the needs of the company."
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
@@ -1094,7 +1097,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
-#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 msgid "Resources"
 msgstr ""
 
@@ -1105,7 +1107,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
 msgstr ""
@@ -1122,6 +1124,16 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
@@ -1162,10 +1174,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1196,6 +1208,16 @@ msgstr ""
 msgid "Revisions"
 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."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,priority:0
 #: field:mrp.production.order,priority:0
@@ -1285,6 +1307,14 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allows you to create and manage manufacturing units consisting "
+"of one or several people and/or machines that can be considered as a unit "
+"for capacity and planning forecasting."
+msgstr ""
+
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:0
 #, python-format
@@ -1307,22 +1337,11 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1333,12 +1352,6 @@ msgstr ""
 msgid "Product Consumed"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Work Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1372,8 +1385,11 @@ msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "'Minimum stock rule' material"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp
@@ -1407,6 +1423,12 @@ msgstr ""
 msgid "SO Number"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component Cost of "
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -1427,9 +1449,9 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
 msgstr ""
 
 #. module: mrp
@@ -1444,6 +1466,12 @@ msgstr ""
 msgid "Manufacturing Orders To Start"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
@@ -1524,6 +1552,7 @@ msgid "Make to Order"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
 msgstr ""
@@ -1597,12 +1626,6 @@ msgstr ""
 msgid "Production Products Consommation"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Total Cost "
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
@@ -1679,7 +1702,6 @@ msgid "Time for 1 cycle (hour)"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1756,6 +1778,14 @@ msgstr ""
 msgid "Valid Until"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
@@ -1766,6 +1796,18 @@ msgstr ""
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -1777,6 +1819,13 @@ msgstr ""
 msgid "Work Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
@@ -1952,6 +2001,7 @@ msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
 msgstr ""
@@ -1993,6 +2043,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2025,6 +2080,22 @@ msgstr ""
 msgid "Productions"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bill of Materials allows you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoM in order to propose automatically manufacturing orders according "
+"to products' needs. You can either create a bill of materials to define "
+"specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2048,6 +2119,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2059,6 +2135,11 @@ msgstr ""
 msgid "Procurements in Exception"
 msgstr ""
 
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
@@ -2117,6 +2198,14 @@ msgstr ""
 msgid "Scheduled End Date"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
@@ -2216,3 +2305,6 @@ msgstr ""
 #: field:mrp.production.order,year:0
 msgid "Year"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
diff --git a/addons/mrp/i18n/ca.po b/addons/mrp/i18n/ca.po
index 2fb6924a8fe..8644c48d884 100644
--- a/addons/mrp/i18n/ca.po
+++ b/addons/mrp/i18n/ca.po
@@ -6,20 +6,21 @@ 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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-27 12:27+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-11-28 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
-msgstr ""
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Moviments creats"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -47,21 +48,15 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
-msgstr "Moviments creats"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
 msgstr "Planificació de recursos de fabricació (MRP)"
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de model no vàlid en la definició de l'acció."
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -191,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr "Conjunt / Paquet"
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -226,11 +209,6 @@ msgstr ""
 msgid "UOM"
 msgstr "UdM"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
 msgid ""
@@ -314,12 +292,6 @@ msgstr "Béns planificats"
 msgid "Sets / Phantom"
 msgstr "Conjunts / Fantasma"
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr "No urgent"
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -330,6 +302,11 @@ msgstr "Referència a una ubicació en una plan. externa"
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -340,11 +317,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
@@ -368,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -509,6 +480,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -583,13 +559,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -614,6 +583,13 @@ msgstr "Línies de les llistes de materials"
 msgid "Time before prod."
 msgstr "Temps abans producció"
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -1071,11 +1047,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1209,10 +1180,10 @@ msgid "Location where the system will stock the finished products."
 msgstr "Ubicació on el sistema emmagatzemarà els productes finalitzats."
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1259,11 +1230,6 @@ msgstr ""
 msgid "Priority"
 msgstr "Prioritat (0=Molt urgent)"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
@@ -1382,11 +1348,6 @@ msgstr "Data inicial"
 msgid "Hour Account"
 msgstr "Compte hores"
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1486,11 +1447,6 @@ msgstr "Realitzat"
 msgid "Change Standard Price"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
@@ -1499,12 +1455,10 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-"especial!"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "No urgent"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1851,6 +1805,18 @@ msgstr "Confirmat"
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -2086,6 +2052,11 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2134,11 +2105,6 @@ msgid ""
 "specific production steps or define a single multi-level bill of materials."
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2162,6 +2128,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2380,6 +2351,9 @@ msgstr ""
 #~ msgid "Automatic orderpoint"
 #~ msgstr "Generació de comanda automàtic"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invàlid per a la definició de la vista!"
+
 #~ msgid "Best price (not yet active!)"
 #~ msgstr "Millor preu (encara no actiu!)"
 
@@ -2771,6 +2745,12 @@ msgstr ""
 #~ msgid "Reordering Mode"
 #~ msgstr "Mode de demanar de nou"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+#~ "especial!"
+
 #~ msgid "Central document to procure products"
 #~ msgstr "Document central per proveir productes"
 
@@ -2990,6 +2970,9 @@ msgstr ""
 #~ "Aquests són els dies afegits als dies que prometeu als clients per raons de "
 #~ "seguretat."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom de model no vàlid en la definició de l'acció."
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Calcula només regles d'estoc mínim"
 
diff --git a/addons/mrp/i18n/cs.po b/addons/mrp/i18n/cs.po
index 174f7492225..9550e98092a 100644
--- a/addons/mrp/i18n/cs.po
+++ b/addons/mrp/i18n/cs.po
@@ -6,19 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 07:30+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-10-30 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
 msgstr ""
 
 #. module: mrp
@@ -47,9 +48,8 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
 msgstr ""
 
 #. module: mrp
@@ -57,11 +57,6 @@ msgstr ""
 msgid "Manufacturing Resource Planning"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Špatný název modelu v definici akce"
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -172,6 +160,15 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allows you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -182,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalidní XML pro zobrazení architektury!"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -218,13 +210,10 @@ msgid "UOM"
 msgstr ""
 
 #. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bills of materials."
 msgstr ""
 
 #. module: mrp
@@ -298,31 +287,11 @@ msgstr ""
 msgid "Scheduled goods"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid ""
-"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None, context=None):\n"
-"        if default is None:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -333,6 +302,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -366,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -454,12 +427,6 @@ msgstr ""
 msgid "Product type is service"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "of "
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
@@ -507,6 +474,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -581,13 +553,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -612,6 +577,13 @@ msgstr ""
 msgid "Time before prod."
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -705,6 +677,12 @@ msgstr "Tisk"
 msgid "Type"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost of "
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
@@ -722,6 +700,17 @@ msgstr ""
 msgid "Couldn't find bill of material for product"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of material in "
+"order to manufacture a product, when you have different ways of building the "
+"same product. You can assign several properties to each Bill of Materials. "
+"When a sales person creates a sales order, he can relate it to several "
+"properties and OpenERP will select automatically the BoM to use according "
+"the the needs."
+msgstr ""
+
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
@@ -793,6 +782,14 @@ msgstr ""
 msgid "Manufacturing Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials Components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM is used a "
+"specific component."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
@@ -867,6 +864,11 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr ""
+
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
@@ -960,11 +962,6 @@ msgstr ""
 msgid "Make to stock"
 msgstr ""
 
-#. module: mrp
-#: view:board.board:0
-msgid "Work Center Future load"
-msgstr ""
-
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
@@ -1044,11 +1041,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1059,6 +1051,17 @@ msgstr ""
 msgid "Manufacturing Orders in Progress"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each stage of production. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP becomes capable of automatically "
+"deciding on the manufacturing route depending on the needs of the company."
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
@@ -1094,7 +1097,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
-#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 msgid "Resources"
 msgstr ""
 
@@ -1105,7 +1107,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
 msgstr ""
@@ -1122,6 +1124,16 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
@@ -1162,10 +1174,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1196,6 +1208,16 @@ msgstr ""
 msgid "Revisions"
 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."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,priority:0
 #: field:mrp.production.order,priority:0
@@ -1285,6 +1307,14 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allows you to create and manage manufacturing units consisting "
+"of one or several people and/or machines that can be considered as a unit "
+"for capacity and planning forecasting."
+msgstr ""
+
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:0
 #, python-format
@@ -1307,22 +1337,11 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1333,12 +1352,6 @@ msgstr ""
 msgid "Product Consumed"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Work Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1372,8 +1385,11 @@ msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "'Minimum stock rule' material"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp
@@ -1407,6 +1423,12 @@ msgstr ""
 msgid "SO Number"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component Cost of "
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -1427,11 +1449,10 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
 msgstr ""
-"Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1445,6 +1466,12 @@ msgstr ""
 msgid "Manufacturing Orders To Start"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
@@ -1525,6 +1552,7 @@ msgid "Make to Order"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
 msgstr ""
@@ -1598,12 +1626,6 @@ msgstr ""
 msgid "Production Products Consommation"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Total Cost "
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
@@ -1680,7 +1702,6 @@ msgid "Time for 1 cycle (hour)"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1757,6 +1778,14 @@ msgstr ""
 msgid "Valid Until"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
@@ -1767,6 +1796,18 @@ msgstr ""
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -1778,6 +1819,13 @@ msgstr ""
 msgid "Work Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
@@ -1953,6 +2001,7 @@ msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
 msgstr ""
@@ -1994,6 +2043,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2026,6 +2080,22 @@ msgstr ""
 msgid "Productions"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bill of Materials allows you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoM in order to propose automatically manufacturing orders according "
+"to products' needs. You can either create a bill of materials to define "
+"specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2049,6 +2119,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2060,6 +2135,11 @@ msgstr ""
 msgid "Procurements in Exception"
 msgstr ""
 
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
@@ -2118,6 +2198,14 @@ msgstr ""
 msgid "Scheduled End Date"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
@@ -2233,6 +2321,17 @@ msgstr ""
 #~ msgid "Parameters"
 #~ msgstr "Parametry(Parameters)"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Špatný název modelu v definici akce"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalidní XML pro zobrazení architektury!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
+
 #~ msgid "Workcenter"
 #~ msgstr "Pracovní centrum"
 
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index be497d2c745..de2462abe30 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.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-11 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/el.po b/addons/mrp/i18n/el.po
index e8492bae47b..a77b6ff242b 100644
--- a/addons/mrp/i18n/el.po
+++ b/addons/mrp/i18n/el.po
@@ -6,23 +6,24 @@ 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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-27 12:17+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: l10n_chart_gr <l10n_chart_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-11-28 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
-msgstr ""
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Δημιουργημένες Κινήσεις"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -50,21 +51,15 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
-msgstr "Δημιουργημένες Κινήσεις"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
 msgstr "Σχεδίαση Πηγών Βιομηχανικής Παραγωγής (MRP)"
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -77,13 +72,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -194,11 +182,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr "Σετ / Πακέτο"
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -229,11 +212,6 @@ msgstr ""
 msgid "UOM"
 msgstr "ΜοΜ"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
 msgid ""
@@ -317,12 +295,6 @@ msgstr "Προγραμματισμένα αγαθά"
 msgid "Sets / Phantom"
 msgstr "Σετ / Πλασματική"
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr "Όχι επείγον"
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -333,6 +305,11 @@ msgstr "Παραπομπή σε σημείο εξωτερικού σχεδίου
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -343,11 +320,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
@@ -371,7 +343,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -512,6 +483,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -586,13 +562,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -617,6 +586,13 @@ msgstr "Γραμμές Κατάστασης Υλικών"
 msgid "Time before prod."
 msgstr "Χρόνος ως την παραγωγή"
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -1074,11 +1050,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1212,10 +1183,10 @@ msgid "Location where the system will stock the finished products."
 msgstr "Τοποθεσία όπου το σύστημα θα αποθηκεύσει τα ολοκληρωμένα προϊόντα."
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1262,11 +1233,6 @@ msgstr ""
 msgid "Priority"
 msgstr "Προτεραιότητα"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
@@ -1385,11 +1351,6 @@ msgstr "Ημερ/νία Εκκίνησης"
 msgid "Hour Account"
 msgstr "Λογαριασμός Ώρας"
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1489,11 +1450,6 @@ msgstr "Ολοκληρώθηκε"
 msgid "Change Standard Price"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
@@ -1502,11 +1458,10 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες!"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "Όχι επείγον"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1853,6 +1808,18 @@ msgstr "Επιβεβαίωση"
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -2088,6 +2055,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2136,11 +2108,6 @@ msgid ""
 "specific production steps or define a single multi-level bill of materials."
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2164,6 +2131,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2359,6 +2331,9 @@ msgstr ""
 #~ msgid "Origin"
 #~ msgstr "Προέλευση"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
+
 #~ msgid "Product & Location"
 #~ msgstr "Προϊόν & Τοποθεσία"
 
@@ -2851,6 +2826,11 @@ msgstr ""
 #~ msgid "Reordering Mode"
 #~ msgstr "Mode Συμπληρωματικής Παραγγελίας"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες!"
+
 #~ msgid "Central document to procure products"
 #~ msgstr "Κεντρικό έγγραφο για προμήθεια Προϊόντων"
 
@@ -3068,6 +3048,9 @@ msgstr ""
 #~ msgid "Bill of Materials Components"
 #~ msgstr "Περιεχόμενα Κατάστασης Υλικών"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
+
 #~ msgid "Product type is Stockable and procure method is make to stock"
 #~ msgstr ""
 #~ "Ο τύπος του είδους είναι αποθηκεύσιμο και η μέθοδος προμήθειας είναι Προς "
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index 3c3368aa79f..7652271a0ba 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/i18n/es.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/es_AR.po b/addons/mrp/i18n/es_AR.po
index 7d577310b3e..d07ce9cd4ba 100644
--- a/addons/mrp/i18n/es_AR.po
+++ b/addons/mrp/i18n/es_AR.po
@@ -6,19 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-04-10 09:09+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-10-30 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
 msgstr ""
 
 #. module: mrp
@@ -47,9 +48,8 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
 msgstr ""
 
 #. module: mrp
@@ -57,11 +57,6 @@ msgstr ""
 msgid "Manufacturing Resource Planning"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -172,6 +160,15 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allows you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -182,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -218,13 +210,10 @@ msgid "UOM"
 msgstr ""
 
 #. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bills of materials."
 msgstr ""
 
 #. module: mrp
@@ -298,31 +287,11 @@ msgstr ""
 msgid "Scheduled goods"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid ""
-"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None, context=None):\n"
-"        if default is None:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -333,6 +302,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -366,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -454,12 +427,6 @@ msgstr ""
 msgid "Product type is service"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "of "
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
@@ -507,6 +474,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -581,13 +553,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -612,6 +577,13 @@ msgstr ""
 msgid "Time before prod."
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -705,6 +677,12 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost of "
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
@@ -722,6 +700,17 @@ msgstr ""
 msgid "Couldn't find bill of material for product"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of material in "
+"order to manufacture a product, when you have different ways of building the "
+"same product. You can assign several properties to each Bill of Materials. "
+"When a sales person creates a sales order, he can relate it to several "
+"properties and OpenERP will select automatically the BoM to use according "
+"the the needs."
+msgstr ""
+
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
@@ -793,6 +782,14 @@ msgstr ""
 msgid "Manufacturing Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials Components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM is used a "
+"specific component."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
@@ -867,6 +864,11 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr ""
+
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
@@ -960,11 +962,6 @@ msgstr ""
 msgid "Make to stock"
 msgstr ""
 
-#. module: mrp
-#: view:board.board:0
-msgid "Work Center Future load"
-msgstr ""
-
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
@@ -1044,11 +1041,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1059,6 +1051,17 @@ msgstr ""
 msgid "Manufacturing Orders in Progress"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each stage of production. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP becomes capable of automatically "
+"deciding on the manufacturing route depending on the needs of the company."
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
@@ -1094,7 +1097,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
-#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 msgid "Resources"
 msgstr ""
 
@@ -1105,7 +1107,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
 msgstr ""
@@ -1122,6 +1124,16 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
@@ -1162,10 +1174,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1196,6 +1208,16 @@ msgstr ""
 msgid "Revisions"
 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."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,priority:0
 #: field:mrp.production.order,priority:0
@@ -1285,6 +1307,14 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allows you to create and manage manufacturing units consisting "
+"of one or several people and/or machines that can be considered as a unit "
+"for capacity and planning forecasting."
+msgstr ""
+
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:0
 #, python-format
@@ -1307,22 +1337,11 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1333,12 +1352,6 @@ msgstr ""
 msgid "Product Consumed"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Work Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1372,8 +1385,11 @@ msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "'Minimum stock rule' material"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp
@@ -1407,6 +1423,12 @@ msgstr ""
 msgid "SO Number"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component Cost of "
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -1427,9 +1449,9 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
 msgstr ""
 
 #. module: mrp
@@ -1444,6 +1466,12 @@ msgstr ""
 msgid "Manufacturing Orders To Start"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
@@ -1524,6 +1552,7 @@ msgid "Make to Order"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
 msgstr ""
@@ -1597,12 +1626,6 @@ msgstr ""
 msgid "Production Products Consommation"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Total Cost "
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
@@ -1679,7 +1702,6 @@ msgid "Time for 1 cycle (hour)"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1756,6 +1778,14 @@ msgstr ""
 msgid "Valid Until"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
@@ -1766,6 +1796,18 @@ msgstr ""
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -1777,6 +1819,13 @@ msgstr ""
 msgid "Work Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
@@ -1952,6 +2001,7 @@ msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
 msgstr ""
@@ -1993,6 +2043,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2025,6 +2080,22 @@ msgstr ""
 msgid "Productions"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bill of Materials allows you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoM in order to propose automatically manufacturing orders according "
+"to products' needs. You can either create a bill of materials to define "
+"specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2048,6 +2119,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2059,6 +2135,11 @@ msgstr ""
 msgid "Procurements in Exception"
 msgstr ""
 
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
@@ -2117,6 +2198,14 @@ msgstr ""
 msgid "Scheduled End Date"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
diff --git a/addons/mrp/i18n/es_EC.po b/addons/mrp/i18n/es_EC.po
index 11e3295448a..cb1a9916edc 100644
--- a/addons/mrp/i18n/es_EC.po
+++ b/addons/mrp/i18n/es_EC.po
@@ -6,20 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-19 00:02+0000\n"
-"Last-Translator: Cristian Salamea (GnuThink) <ovnicraft@gmail.com>\n"
+"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@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-10-30 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
-msgstr ""
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Movimientos creados"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -47,21 +48,15 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
-msgstr "Movimientos creados"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
 msgstr "Planificación de recursos de fabricación (MRP)"
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -172,6 +160,15 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allows you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -182,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr "Conjunto / Paquete"
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -218,14 +210,11 @@ msgid "UOM"
 msgstr "UdM"
 
 #. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
-msgstr "Ctdad producto"
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bills of materials."
+msgstr ""
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
@@ -298,31 +287,11 @@ msgstr "Cantidad en horas"
 msgid "Scheduled goods"
 msgstr "Bienes planificados"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid ""
-"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None, context=None):\n"
-"        if default is None:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
 msgstr "Conjuntos / Fantasma"
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr "No urgente"
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -333,6 +302,11 @@ msgstr "Referencia a una ubicación en una plan. externa"
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -366,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -458,12 +431,6 @@ msgstr "Estructura lista de materiales"
 msgid "Product type is service"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "of "
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
@@ -513,6 +480,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -587,13 +559,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -618,6 +583,13 @@ msgstr "Líneas de las listas de materiales"
 msgid "Time before prod."
 msgstr "Tiempo antes producción"
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -711,6 +683,12 @@ msgstr "Imprimir"
 msgid "Type"
 msgstr "Tipo"
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost of "
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
@@ -728,6 +706,17 @@ msgstr "Por mes"
 msgid "Couldn't find bill of material for product"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of material in "
+"order to manufacture a product, when you have different ways of building the "
+"same product. You can assign several properties to each Bill of Materials. "
+"When a sales person creates a sales order, he can relate it to several "
+"properties and OpenERP will select automatically the BoM to use according "
+"the the needs."
+msgstr ""
+
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
@@ -799,6 +788,14 @@ msgstr ""
 msgid "Manufacturing Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials Components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM is used a "
+"specific component."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
@@ -873,6 +870,11 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr ""
+
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
@@ -966,11 +968,6 @@ msgstr ""
 msgid "Make to stock"
 msgstr "Obtener para stock"
 
-#. module: mrp
-#: view:board.board:0
-msgid "Work Center Future load"
-msgstr ""
-
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
@@ -1050,11 +1047,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1065,6 +1057,17 @@ msgstr ""
 msgid "Manufacturing Orders in Progress"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each stage of production. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP becomes capable of automatically "
+"deciding on the manufacturing route depending on the needs of the company."
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
@@ -1100,7 +1103,6 @@ msgstr "Ubicación productos finalizados"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
-#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 msgid "Resources"
 msgstr ""
 
@@ -1111,7 +1113,7 @@ msgstr "Diario analítico"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
 msgstr ""
@@ -1128,6 +1130,16 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr "Ctdad producto"
+
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
@@ -1168,10 +1180,10 @@ msgid "Location where the system will stock the finished products."
 msgstr "Ubicación donde el sistema almacenará los productos finalizados."
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1202,6 +1214,16 @@ msgstr "Día por día"
 msgid "Revisions"
 msgstr "Revisiones"
 
+#. 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."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,priority:0
 #: field:mrp.production.order,priority:0
@@ -1291,6 +1313,14 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allows you to create and manage manufacturing units consisting "
+"of one or several people and/or machines that can be considered as a unit "
+"for capacity and planning forecasting."
+msgstr ""
+
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:0
 #, python-format
@@ -1313,22 +1343,11 @@ msgstr "Despiece de la LdM"
 msgid "Start Date"
 msgstr "Fecha inicial"
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr "Cuenta horas"
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1339,12 +1358,6 @@ msgstr ""
 msgid "Product Consumed"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Work Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1378,8 +1391,11 @@ msgid "Scheduled date"
 msgstr "Fecha planificada"
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "'Minimum stock rule' material"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp
@@ -1413,6 +1429,12 @@ msgstr "Cuenta general"
 msgid "SO Number"
 msgstr "Número venta"
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component Cost of "
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -1433,12 +1455,10 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "No urgente"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1452,6 +1472,12 @@ msgstr ""
 msgid "Manufacturing Orders To Start"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
@@ -1532,6 +1558,7 @@ msgid "Make to Order"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
 msgstr ""
@@ -1606,12 +1633,6 @@ msgstr "Productos planificados"
 msgid "Production Products Consommation"
 msgstr "Consumición de productos producidos"
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Total Cost "
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
@@ -1690,7 +1711,6 @@ msgid "Time for 1 cycle (hour)"
 msgstr "Tiempo para 1 ciclo (horas)"
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1767,6 +1787,14 @@ msgstr "Ctdad UdV producto"
 msgid "Valid Until"
 msgstr "Válido hasta"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
@@ -1777,6 +1805,18 @@ msgstr "Confirmar"
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -1788,6 +1828,13 @@ msgstr "Redondeo del producto"
 msgid "Work Order"
 msgstr "Orden de entrega"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
@@ -1963,6 +2010,7 @@ msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
 msgstr ""
@@ -2004,6 +2052,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2036,6 +2089,22 @@ msgstr "Información general"
 msgid "Productions"
 msgstr "Producciones"
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bill of Materials allows you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoM in order to propose automatically manufacturing orders according "
+"to products' needs. You can either create a bill of materials to define "
+"specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2059,6 +2128,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2070,6 +2144,11 @@ msgstr "Producción"
 msgid "Procurements in Exception"
 msgstr ""
 
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
@@ -2128,6 +2207,14 @@ msgstr ""
 msgid "Scheduled End Date"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
diff --git a/addons/mrp/i18n/et.po b/addons/mrp/i18n/et.po
index 95ccc43eb63..935b6bc4c82 100644
--- a/addons/mrp/i18n/et.po
+++ b/addons/mrp/i18n/et.po
@@ -6,20 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-10-30 09: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-10-31 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
-msgstr ""
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Liikumised loodud"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -47,21 +48,15 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
-msgstr "Liikumised loodud"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
 msgstr "Tootmisvahendite planeerimine"
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -172,6 +160,15 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allows you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -182,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -218,14 +210,11 @@ msgid "UOM"
 msgstr "Mõõtühik"
 
 #. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
-msgstr "Toote kogus"
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bills of materials."
+msgstr ""
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
@@ -298,31 +287,11 @@ msgstr "Kogus tunnis"
 msgid "Scheduled goods"
 msgstr "Planeeritud kaubad"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid ""
-"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None, context=None):\n"
-"        if default is None:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr "Pole kiire"
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -333,6 +302,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -366,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -454,12 +427,6 @@ msgstr "Kaubakoosluse struktuur"
 msgid "Product type is service"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "of "
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
@@ -507,6 +474,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -581,13 +553,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -612,6 +577,13 @@ msgstr ""
 msgid "Time before prod."
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -705,6 +677,12 @@ msgstr "Trüki"
 msgid "Type"
 msgstr "Liik"
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost of "
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
@@ -722,6 +700,17 @@ msgstr "Kuus"
 msgid "Couldn't find bill of material for product"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of material in "
+"order to manufacture a product, when you have different ways of building the "
+"same product. You can assign several properties to each Bill of Materials. "
+"When a sales person creates a sales order, he can relate it to several "
+"properties and OpenERP will select automatically the BoM to use according "
+"the the needs."
+msgstr ""
+
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
@@ -793,6 +782,14 @@ msgstr ""
 msgid "Manufacturing Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials Components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM is used a "
+"specific component."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
@@ -867,6 +864,11 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr ""
+
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
@@ -960,11 +962,6 @@ msgstr ""
 msgid "Make to stock"
 msgstr ""
 
-#. module: mrp
-#: view:board.board:0
-msgid "Work Center Future load"
-msgstr ""
-
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
@@ -1044,11 +1041,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1059,6 +1051,17 @@ msgstr ""
 msgid "Manufacturing Orders in Progress"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each stage of production. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP becomes capable of automatically "
+"deciding on the manufacturing route depending on the needs of the company."
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
@@ -1094,7 +1097,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
-#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 msgid "Resources"
 msgstr ""
 
@@ -1105,7 +1107,7 @@ msgstr "Analüütiline päevik"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
 msgstr ""
@@ -1122,6 +1124,16 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr "Toote kogus"
+
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
@@ -1162,10 +1174,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1196,6 +1208,16 @@ msgstr "Päev päevajärel"
 msgid "Revisions"
 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."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,priority:0
 #: field:mrp.production.order,priority:0
@@ -1285,6 +1307,14 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allows you to create and manage manufacturing units consisting "
+"of one or several people and/or machines that can be considered as a unit "
+"for capacity and planning forecasting."
+msgstr ""
+
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:0
 #, python-format
@@ -1307,22 +1337,11 @@ msgstr "Mõõteühikute struktuur"
 msgid "Start Date"
 msgstr "Alguskuupäev"
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1333,12 +1352,6 @@ msgstr ""
 msgid "Product Consumed"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Work Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1372,8 +1385,11 @@ msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "'Minimum stock rule' material"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp
@@ -1407,6 +1423,12 @@ msgstr "Üldine konto"
 msgid "SO Number"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component Cost of "
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -1427,11 +1449,10 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: 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 !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "Pole kiire"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1445,6 +1466,12 @@ msgstr ""
 msgid "Manufacturing Orders To Start"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
@@ -1525,6 +1552,7 @@ msgid "Make to Order"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
 msgstr ""
@@ -1598,12 +1626,6 @@ msgstr ""
 msgid "Production Products Consommation"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Total Cost "
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
@@ -1682,7 +1704,6 @@ msgid "Time for 1 cycle (hour)"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1759,6 +1780,14 @@ msgstr ""
 msgid "Valid Until"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
@@ -1769,6 +1798,18 @@ msgstr ""
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -1780,6 +1821,13 @@ msgstr ""
 msgid "Work Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
@@ -1955,6 +2003,7 @@ msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
 msgstr ""
@@ -1996,6 +2045,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2028,6 +2082,22 @@ msgstr ""
 msgid "Productions"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bill of Materials allows you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoM in order to propose automatically manufacturing orders according "
+"to products' needs. You can either create a bill of materials to define "
+"specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2051,6 +2121,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2062,6 +2137,11 @@ msgstr ""
 msgid "Procurements in Exception"
 msgstr ""
 
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
@@ -2120,6 +2200,14 @@ msgstr ""
 msgid "Scheduled End Date"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
@@ -2238,6 +2326,9 @@ msgstr ""
 #~ msgid "Origin"
 #~ msgstr "Allikas"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Vigane XML vaate arhitektuurile!"
+
 #~ msgid "Best price (not yet active!)"
 #~ msgstr "Parim hind (pole veel aktiivne!)"
 
@@ -2414,6 +2505,11 @@ msgstr ""
 #~ msgid "Change Product Qty."
 #~ msgstr "Muuda tootekogust"
 
+#~ 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 "Production Orders in Progress"
 #~ msgstr "Käimasolevad tootmiskorraldused"
 
@@ -2435,6 +2531,9 @@ msgstr ""
 #~ msgid "Reservation"
 #~ msgstr "Reserveering"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
+
 #~ msgid "UoS Quantity"
 #~ msgstr "MüÜ kogus"
 
diff --git a/addons/mrp/i18n/fi.po b/addons/mrp/i18n/fi.po
index bdbedc1da4d..3d2d6d50c84 100644
--- a/addons/mrp/i18n/fi.po
+++ b/addons/mrp/i18n/fi.po
@@ -7,20 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-27 12:16+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Finnish <fi@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-28 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
-msgstr ""
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Luodut siirrot"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -48,21 +49,15 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
-msgstr "Luodut siirrot"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
 msgstr "Tuotannon resurssien suunnittelu"
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -75,13 +70,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -192,11 +180,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr "Sarja / Pakkaus"
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -227,11 +210,6 @@ msgstr ""
 msgid "UOM"
 msgstr "Mittayksikkö"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
 msgid ""
@@ -315,12 +293,6 @@ msgstr "Suunnitellut tavarat"
 msgid "Sets / Phantom"
 msgstr "Sarja / Haamu"
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr "Ei kiireellinen"
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -331,6 +303,11 @@ msgstr "Viittaus asemaan ulkoisessa suunnitelmassa."
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -341,11 +318,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
@@ -369,7 +341,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -509,6 +480,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -583,13 +559,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -614,6 +583,13 @@ msgstr "Osaluettelon rivit"
 msgid "Time before prod."
 msgstr "Aika ennen tuotantoa"
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -1071,11 +1047,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1209,10 +1180,10 @@ msgid "Location where the system will stock the finished products."
 msgstr "Paikka jonne järjestelmä varastoi valmiit tuotteet."
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1259,11 +1230,6 @@ msgstr ""
 msgid "Priority"
 msgstr "Prioriteetti"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
@@ -1382,11 +1348,6 @@ msgstr "Aloituspäivämäärä"
 msgid "Hour Account"
 msgstr "Tuntitili"
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1486,11 +1447,6 @@ msgstr "Valmis"
 msgid "Change Standard Price"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
@@ -1499,10 +1455,10 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "Ei kiireellinen"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1849,6 +1805,18 @@ msgstr "Vahvista"
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -2084,6 +2052,11 @@ msgstr ""
 msgid "Error"
 msgstr "Virhe"
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2132,11 +2105,6 @@ msgid ""
 "specific production steps or define a single multi-level bill of materials."
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2160,6 +2128,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2468,6 +2441,9 @@ msgstr ""
 #~ msgid "Scheduled End"
 #~ msgstr "Ajoitettu loppu"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
+
 #~ msgid "UoS Quantity"
 #~ msgstr "Myyntiyksikkö määrä"
 
@@ -2486,6 +2462,9 @@ msgstr ""
 #~ msgid "Stockable Stock"
 #~ msgstr "Varastoitavissa oleva varasto"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
+
 #~ msgid ""
 #~ "Number of operation this workcenter can do in parallel. If this workcenter "
 #~ "represent a team of 5 workers, the capacity per cycle is 5."
@@ -2771,6 +2750,10 @@ msgstr ""
 #~ msgid "Production Orders in Progress"
 #~ msgstr "Tuotantotilaukset jotka keskeneräisiä"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
+
 #~ msgid "Production Workcenters"
 #~ msgstr "Tuotannon työpisteet"
 
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index 91ffae12bfe..36bf5fc57a7 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/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-11 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/hi.po b/addons/mrp/i18n/hi.po
index 773c2239755..ac5115ee9e3 100644
--- a/addons/mrp/i18n/hi.po
+++ b/addons/mrp/i18n/hi.po
@@ -7,19 +7,20 @@ 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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 08:21+0000\n"
 "Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
 "Language-Team: Hindi <hi@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:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
 msgstr ""
 
 #. module: mrp
@@ -48,9 +49,8 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
 msgstr ""
 
 #. module: mrp
@@ -58,11 +58,6 @@ msgstr ""
 msgid "Manufacturing Resource Planning"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -75,13 +70,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -173,6 +161,15 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allows you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -183,11 +180,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "संरचना देखने के लिए अमान्य XML!"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -219,14 +211,11 @@ msgid "UOM"
 msgstr ""
 
 #. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
-msgstr "उत्पाद मात्रा"
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bills of materials."
+msgstr ""
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
@@ -299,31 +288,11 @@ msgstr "घंटों में राशि"
 msgid "Scheduled goods"
 msgstr "अनुसूचित माल"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid ""
-"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None, context=None):\n"
-"        if default is None:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -334,6 +303,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -367,7 +341,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -455,12 +428,6 @@ msgstr ""
 msgid "Product type is service"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "of "
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
@@ -508,6 +475,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -582,13 +554,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -613,6 +578,13 @@ msgstr ""
 msgid "Time before prod."
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -706,6 +678,12 @@ msgstr "प्रिंट"
 msgid "Type"
 msgstr "प्रकार"
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost of "
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
@@ -723,6 +701,17 @@ msgstr "प्रति माह"
 msgid "Couldn't find bill of material for product"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of material in "
+"order to manufacture a product, when you have different ways of building the "
+"same product. You can assign several properties to each Bill of Materials. "
+"When a sales person creates a sales order, he can relate it to several "
+"properties and OpenERP will select automatically the BoM to use according "
+"the the needs."
+msgstr ""
+
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
@@ -794,6 +783,14 @@ msgstr ""
 msgid "Manufacturing Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials Components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM is used a "
+"specific component."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
@@ -868,6 +865,11 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr ""
+
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
@@ -961,11 +963,6 @@ msgstr ""
 msgid "Make to stock"
 msgstr ""
 
-#. module: mrp
-#: view:board.board:0
-msgid "Work Center Future load"
-msgstr ""
-
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
@@ -1045,11 +1042,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1060,6 +1052,17 @@ msgstr ""
 msgid "Manufacturing Orders in Progress"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each stage of production. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP becomes capable of automatically "
+"deciding on the manufacturing route depending on the needs of the company."
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
@@ -1095,7 +1098,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
-#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 msgid "Resources"
 msgstr ""
 
@@ -1106,7 +1108,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
 msgstr ""
@@ -1123,6 +1125,16 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr "उत्पाद मात्रा"
+
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
@@ -1163,10 +1175,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1197,6 +1209,16 @@ msgstr ""
 msgid "Revisions"
 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."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,priority:0
 #: field:mrp.production.order,priority:0
@@ -1286,6 +1308,14 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allows you to create and manage manufacturing units consisting "
+"of one or several people and/or machines that can be considered as a unit "
+"for capacity and planning forecasting."
+msgstr ""
+
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:0
 #, python-format
@@ -1308,22 +1338,11 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1334,12 +1353,6 @@ msgstr ""
 msgid "Product Consumed"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Work Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1373,8 +1386,11 @@ msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "'Minimum stock rule' material"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp
@@ -1408,6 +1424,12 @@ msgstr ""
 msgid "SO Number"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component Cost of "
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -1428,9 +1450,9 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
 msgstr ""
 
 #. module: mrp
@@ -1445,6 +1467,12 @@ msgstr ""
 msgid "Manufacturing Orders To Start"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
@@ -1525,6 +1553,7 @@ msgid "Make to Order"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
 msgstr ""
@@ -1598,12 +1627,6 @@ msgstr ""
 msgid "Production Products Consommation"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Total Cost "
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
@@ -1680,7 +1703,6 @@ msgid "Time for 1 cycle (hour)"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1757,6 +1779,14 @@ msgstr ""
 msgid "Valid Until"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
@@ -1767,6 +1797,18 @@ msgstr ""
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -1778,6 +1820,13 @@ msgstr ""
 msgid "Work Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
@@ -1953,6 +2002,7 @@ msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
 msgstr ""
@@ -1994,6 +2044,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2026,6 +2081,22 @@ msgstr ""
 msgid "Productions"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bill of Materials allows you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoM in order to propose automatically manufacturing orders according "
+"to products' needs. You can either create a bill of materials to define "
+"specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2049,6 +2120,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2060,6 +2136,11 @@ msgstr ""
 msgid "Procurements in Exception"
 msgstr ""
 
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
@@ -2118,6 +2199,14 @@ msgstr ""
 msgid "Scheduled End Date"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
@@ -2230,6 +2319,9 @@ msgstr ""
 #~ msgid "Products Consummed"
 #~ msgstr "उत्पादों की खपत"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "संरचना देखने के लिए अमान्य XML!"
+
 #~ msgid "Origin"
 #~ msgstr "मूल श्रोत"
 
diff --git a/addons/mrp/i18n/hr.po b/addons/mrp/i18n/hr.po
index 287970c5b05..6b4981ff6cb 100644
--- a/addons/mrp/i18n/hr.po
+++ b/addons/mrp/i18n/hr.po
@@ -6,19 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 08:21+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
 msgstr ""
 
 #. module: mrp
@@ -47,9 +48,8 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
 msgstr ""
 
 #. module: mrp
@@ -57,11 +57,6 @@ msgstr ""
 msgid "Manufacturing Resource Planning"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Pogrešno ime modela u definiciji Radnje."
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -172,6 +160,15 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allows you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -182,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za Arhitekturu Prikaza!"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -218,13 +210,10 @@ msgid "UOM"
 msgstr ""
 
 #. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bills of materials."
 msgstr ""
 
 #. module: mrp
@@ -298,31 +287,11 @@ msgstr ""
 msgid "Scheduled goods"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid ""
-"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None, context=None):\n"
-"        if default is None:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -333,6 +302,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -366,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -454,12 +427,6 @@ msgstr ""
 msgid "Product type is service"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "of "
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
@@ -507,6 +474,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -581,13 +553,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -612,6 +577,13 @@ msgstr ""
 msgid "Time before prod."
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -705,6 +677,12 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost of "
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
@@ -722,6 +700,17 @@ msgstr ""
 msgid "Couldn't find bill of material for product"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of material in "
+"order to manufacture a product, when you have different ways of building the "
+"same product. You can assign several properties to each Bill of Materials. "
+"When a sales person creates a sales order, he can relate it to several "
+"properties and OpenERP will select automatically the BoM to use according "
+"the the needs."
+msgstr ""
+
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
@@ -793,6 +782,14 @@ msgstr ""
 msgid "Manufacturing Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials Components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM is used a "
+"specific component."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
@@ -867,6 +864,11 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr ""
+
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
@@ -960,11 +962,6 @@ msgstr ""
 msgid "Make to stock"
 msgstr ""
 
-#. module: mrp
-#: view:board.board:0
-msgid "Work Center Future load"
-msgstr ""
-
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
@@ -1044,11 +1041,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1059,6 +1051,17 @@ msgstr ""
 msgid "Manufacturing Orders in Progress"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each stage of production. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP becomes capable of automatically "
+"deciding on the manufacturing route depending on the needs of the company."
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
@@ -1094,7 +1097,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
-#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 msgid "Resources"
 msgstr ""
 
@@ -1105,7 +1107,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
 msgstr ""
@@ -1122,6 +1124,16 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
@@ -1162,10 +1174,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1196,6 +1208,16 @@ msgstr ""
 msgid "Revisions"
 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."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,priority:0
 #: field:mrp.production.order,priority:0
@@ -1285,6 +1307,14 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allows you to create and manage manufacturing units consisting "
+"of one or several people and/or machines that can be considered as a unit "
+"for capacity and planning forecasting."
+msgstr ""
+
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:0
 #, python-format
@@ -1307,22 +1337,11 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1333,12 +1352,6 @@ msgstr ""
 msgid "Product Consumed"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Work Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1372,8 +1385,11 @@ msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "'Minimum stock rule' material"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp
@@ -1407,6 +1423,12 @@ msgstr ""
 msgid "SO Number"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component Cost of "
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -1427,11 +1449,10 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
 msgstr ""
-"Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1445,6 +1466,12 @@ msgstr ""
 msgid "Manufacturing Orders To Start"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
@@ -1525,6 +1552,7 @@ msgid "Make to Order"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
 msgstr ""
@@ -1598,12 +1626,6 @@ msgstr ""
 msgid "Production Products Consommation"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Total Cost "
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
@@ -1680,7 +1702,6 @@ msgid "Time for 1 cycle (hour)"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1757,6 +1778,14 @@ msgstr ""
 msgid "Valid Until"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
@@ -1767,6 +1796,18 @@ msgstr ""
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -1778,6 +1819,13 @@ msgstr ""
 msgid "Work Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
@@ -1953,6 +2001,7 @@ msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
 msgstr ""
@@ -1994,6 +2043,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2026,6 +2080,22 @@ msgstr ""
 msgid "Productions"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bill of Materials allows you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoM in order to propose automatically manufacturing orders according "
+"to products' needs. You can either create a bill of materials to define "
+"specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2049,6 +2119,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2060,6 +2135,11 @@ msgstr ""
 msgid "Procurements in Exception"
 msgstr ""
 
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
@@ -2118,6 +2198,14 @@ msgstr ""
 msgid "Scheduled End Date"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
@@ -2218,6 +2306,17 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Pogrešno ime modela u definiciji Radnje."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nevažeći XML za Arhitekturu Prikaza!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
+
 #~ msgid "Workcenter"
 #~ msgstr "Radni Centar"
 
diff --git a/addons/mrp/i18n/hu.po b/addons/mrp/i18n/hu.po
index 1f890e78763..e672791c85e 100644
--- a/addons/mrp/i18n/hu.po
+++ b/addons/mrp/i18n/hu.po
@@ -6,19 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-09-08 16:47+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-10-30 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
 msgstr ""
 
 #. module: mrp
@@ -47,9 +48,8 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
 msgstr ""
 
 #. module: mrp
@@ -57,11 +57,6 @@ msgstr ""
 msgid "Manufacturing Resource Planning"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -172,6 +160,15 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allows you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -182,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -218,13 +210,10 @@ msgid "UOM"
 msgstr ""
 
 #. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bills of materials."
 msgstr ""
 
 #. module: mrp
@@ -298,31 +287,11 @@ msgstr ""
 msgid "Scheduled goods"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid ""
-"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None, context=None):\n"
-"        if default is None:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -333,6 +302,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -366,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -454,12 +427,6 @@ msgstr ""
 msgid "Product type is service"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "of "
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
@@ -507,6 +474,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -581,13 +553,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -612,6 +577,13 @@ msgstr ""
 msgid "Time before prod."
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -705,6 +677,12 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost of "
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
@@ -722,6 +700,17 @@ msgstr ""
 msgid "Couldn't find bill of material for product"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of material in "
+"order to manufacture a product, when you have different ways of building the "
+"same product. You can assign several properties to each Bill of Materials. "
+"When a sales person creates a sales order, he can relate it to several "
+"properties and OpenERP will select automatically the BoM to use according "
+"the the needs."
+msgstr ""
+
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
@@ -793,6 +782,14 @@ msgstr ""
 msgid "Manufacturing Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials Components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM is used a "
+"specific component."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
@@ -867,6 +864,11 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr ""
+
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
@@ -960,11 +962,6 @@ msgstr ""
 msgid "Make to stock"
 msgstr ""
 
-#. module: mrp
-#: view:board.board:0
-msgid "Work Center Future load"
-msgstr ""
-
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
@@ -1044,11 +1041,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1059,6 +1051,17 @@ msgstr ""
 msgid "Manufacturing Orders in Progress"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each stage of production. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP becomes capable of automatically "
+"deciding on the manufacturing route depending on the needs of the company."
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
@@ -1094,7 +1097,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
-#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 msgid "Resources"
 msgstr ""
 
@@ -1105,7 +1107,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
 msgstr ""
@@ -1122,6 +1124,16 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
@@ -1162,10 +1174,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1196,6 +1208,16 @@ msgstr ""
 msgid "Revisions"
 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."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,priority:0
 #: field:mrp.production.order,priority:0
@@ -1285,6 +1307,14 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allows you to create and manage manufacturing units consisting "
+"of one or several people and/or machines that can be considered as a unit "
+"for capacity and planning forecasting."
+msgstr ""
+
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:0
 #, python-format
@@ -1307,22 +1337,11 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1333,12 +1352,6 @@ msgstr ""
 msgid "Product Consumed"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Work Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1372,8 +1385,11 @@ msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "'Minimum stock rule' material"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp
@@ -1407,6 +1423,12 @@ msgstr ""
 msgid "SO Number"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component Cost of "
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -1427,9 +1449,9 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
 msgstr ""
 
 #. module: mrp
@@ -1444,6 +1466,12 @@ msgstr ""
 msgid "Manufacturing Orders To Start"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
@@ -1524,6 +1552,7 @@ msgid "Make to Order"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
 msgstr ""
@@ -1597,12 +1626,6 @@ msgstr ""
 msgid "Production Products Consommation"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Total Cost "
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
@@ -1679,7 +1702,6 @@ msgid "Time for 1 cycle (hour)"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1756,6 +1778,14 @@ msgstr ""
 msgid "Valid Until"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
@@ -1766,6 +1796,18 @@ msgstr ""
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -1777,6 +1819,13 @@ msgstr ""
 msgid "Work Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
@@ -1952,6 +2001,7 @@ msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
 msgstr ""
@@ -1993,6 +2043,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2025,6 +2080,22 @@ msgstr ""
 msgid "Productions"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bill of Materials allows you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoM in order to propose automatically manufacturing orders according "
+"to products' needs. You can either create a bill of materials to define "
+"specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2048,6 +2119,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2059,6 +2135,11 @@ msgstr ""
 msgid "Procurements in Exception"
 msgstr ""
 
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
@@ -2117,6 +2198,14 @@ msgstr ""
 msgid "Scheduled End Date"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
diff --git a/addons/mrp/i18n/id.po b/addons/mrp/i18n/id.po
index 01a2003fe57..251af6b84e4 100644
--- a/addons/mrp/i18n/id.po
+++ b/addons/mrp/i18n/id.po
@@ -6,19 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 08:22+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
 msgstr ""
 
 #. module: mrp
@@ -47,9 +48,8 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
 msgstr ""
 
 #. module: mrp
@@ -57,11 +57,6 @@ msgstr ""
 msgid "Manufacturing Resource Planning"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -172,6 +160,15 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allows you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -182,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -218,13 +210,10 @@ msgid "UOM"
 msgstr ""
 
 #. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bills of materials."
 msgstr ""
 
 #. module: mrp
@@ -298,31 +287,11 @@ msgstr ""
 msgid "Scheduled goods"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid ""
-"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None, context=None):\n"
-"        if default is None:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -333,6 +302,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -366,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -454,12 +427,6 @@ msgstr ""
 msgid "Product type is service"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "of "
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
@@ -507,6 +474,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -581,13 +553,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -612,6 +577,13 @@ msgstr ""
 msgid "Time before prod."
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -705,6 +677,12 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost of "
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
@@ -722,6 +700,17 @@ msgstr ""
 msgid "Couldn't find bill of material for product"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of material in "
+"order to manufacture a product, when you have different ways of building the "
+"same product. You can assign several properties to each Bill of Materials. "
+"When a sales person creates a sales order, he can relate it to several "
+"properties and OpenERP will select automatically the BoM to use according "
+"the the needs."
+msgstr ""
+
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
@@ -793,6 +782,14 @@ msgstr ""
 msgid "Manufacturing Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials Components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM is used a "
+"specific component."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
@@ -867,6 +864,11 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr ""
+
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
@@ -960,11 +962,6 @@ msgstr ""
 msgid "Make to stock"
 msgstr ""
 
-#. module: mrp
-#: view:board.board:0
-msgid "Work Center Future load"
-msgstr ""
-
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
@@ -1044,11 +1041,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1059,6 +1051,17 @@ msgstr ""
 msgid "Manufacturing Orders in Progress"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each stage of production. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP becomes capable of automatically "
+"deciding on the manufacturing route depending on the needs of the company."
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
@@ -1094,7 +1097,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
-#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 msgid "Resources"
 msgstr ""
 
@@ -1105,7 +1107,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
 msgstr ""
@@ -1122,6 +1124,16 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
@@ -1162,10 +1174,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1196,6 +1208,16 @@ msgstr ""
 msgid "Revisions"
 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."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,priority:0
 #: field:mrp.production.order,priority:0
@@ -1285,6 +1307,14 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allows you to create and manage manufacturing units consisting "
+"of one or several people and/or machines that can be considered as a unit "
+"for capacity and planning forecasting."
+msgstr ""
+
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:0
 #, python-format
@@ -1307,22 +1337,11 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1333,12 +1352,6 @@ msgstr ""
 msgid "Product Consumed"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Work Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1372,8 +1385,11 @@ msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "'Minimum stock rule' material"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp
@@ -1407,6 +1423,12 @@ msgstr ""
 msgid "SO Number"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component Cost of "
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -1427,9 +1449,9 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
 msgstr ""
 
 #. module: mrp
@@ -1444,6 +1466,12 @@ msgstr ""
 msgid "Manufacturing Orders To Start"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
@@ -1524,6 +1552,7 @@ msgid "Make to Order"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
 msgstr ""
@@ -1597,12 +1626,6 @@ msgstr ""
 msgid "Production Products Consommation"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Total Cost "
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
@@ -1679,7 +1702,6 @@ msgid "Time for 1 cycle (hour)"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1756,6 +1778,14 @@ msgstr ""
 msgid "Valid Until"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
@@ -1766,6 +1796,18 @@ msgstr ""
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -1777,6 +1819,13 @@ msgstr ""
 msgid "Work Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
@@ -1952,6 +2001,7 @@ msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
 msgstr ""
@@ -1993,6 +2043,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2025,6 +2080,22 @@ msgstr ""
 msgid "Productions"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bill of Materials allows you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoM in order to propose automatically manufacturing orders according "
+"to products' needs. You can either create a bill of materials to define "
+"specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2048,6 +2119,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2059,6 +2135,11 @@ msgstr ""
 msgid "Procurements in Exception"
 msgstr ""
 
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
@@ -2117,6 +2198,14 @@ msgstr ""
 msgid "Scheduled End Date"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
diff --git a/addons/mrp/i18n/it.po b/addons/mrp/i18n/it.po
index 1c44c68b9dc..7b71f43f44c 100644
--- a/addons/mrp/i18n/it.po
+++ b/addons/mrp/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-11 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/ko.po b/addons/mrp/i18n/ko.po
index bbeb2c2f103..13af2749cfb 100644
--- a/addons/mrp/i18n/ko.po
+++ b/addons/mrp/i18n/ko.po
@@ -7,20 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-27 12:18+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.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-11-28 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
-msgstr ""
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "생성된 무브"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -48,21 +49,15 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
-msgstr "생성된 무브"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
 msgstr "제조 리소스 계획"
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -75,13 +70,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -192,11 +180,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr "세트 / 팩"
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "뷰 아키텍처용 XML로 유효하지 않음!"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -227,11 +210,6 @@ msgstr ""
 msgid "UOM"
 msgstr "UoM"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
 msgid ""
@@ -315,12 +293,6 @@ msgstr "계획된 제품"
 msgid "Sets / Phantom"
 msgstr "세트 / 판톰"
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr "긴급하지 않음"
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -331,6 +303,11 @@ msgstr "외부 플랜 내 위치에 대한 참조"
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -341,11 +318,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
@@ -369,7 +341,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -506,6 +477,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -580,13 +556,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -611,6 +580,13 @@ msgstr "BoM 라인"
 msgid "Time before prod."
 msgstr "생산 준비 시간"
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -1068,11 +1044,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1206,10 +1177,10 @@ msgid "Location where the system will stock the finished products."
 msgstr "완제품을 보관할 시스템의 위치"
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1256,11 +1227,6 @@ msgstr ""
 msgid "Priority"
 msgstr "우선순위"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
@@ -1379,11 +1345,6 @@ msgstr "시작 날짜"
 msgid "Hour Account"
 msgstr "시간 계정"
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1483,11 +1444,6 @@ msgstr "완료"
 msgid "Change Standard Price"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
@@ -1496,10 +1452,10 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "오브젝트 이름은 x_로 시작하고, 특수 문자가 없어야 합니다 !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "긴급하지 않음"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1843,6 +1799,18 @@ msgstr "확정"
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -2078,6 +2046,11 @@ msgstr ""
 msgid "Error"
 msgstr "에러"
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2126,11 +2099,6 @@ msgid ""
 "specific production steps or define a single multi-level bill of materials."
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2154,6 +2122,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2355,6 +2328,9 @@ msgstr ""
 #~ msgid "Packing list"
 #~ msgstr "포장 리스트"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "뷰 아키텍처용 XML로 유효하지 않음!"
+
 #~ msgid "Best price (not yet active!)"
 #~ msgstr "최고 가격 (아직 비활성 !)"
 
@@ -2690,6 +2666,10 @@ msgstr ""
 #~ msgid "Reordering Mode"
 #~ msgstr "재 주문 모드"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "오브젝트 이름은 x_로 시작하고, 특수 문자가 없어야 합니다 !"
+
 #~ msgid "Date Closed"
 #~ msgstr "마감된 날짜"
 
diff --git a/addons/mrp/i18n/lt.po b/addons/mrp/i18n/lt.po
index a920da42f79..bcf9c7f03bb 100644
--- a/addons/mrp/i18n/lt.po
+++ b/addons/mrp/i18n/lt.po
@@ -6,21 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-07-20 22:46+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-10-30 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
-msgstr ""
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Sukurta perdavimų"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -48,21 +49,15 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
-msgstr "Sukurta perdavimų"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -75,13 +70,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -173,6 +161,15 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allows you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -183,11 +180,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr "Nustatyti / Pakuoti"
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -219,14 +211,11 @@ msgid "UOM"
 msgstr "Mat. vnt."
 
 #. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
-msgstr "Produkto kiekis"
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bills of materials."
+msgstr ""
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
@@ -299,31 +288,11 @@ msgstr "Suma valandomis"
 msgid "Scheduled goods"
 msgstr "Suplanuotos žaliavos"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid ""
-"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None, context=None):\n"
-"        if default is None:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
 msgstr "Nustatytas"
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr "Neskubu"
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -334,6 +303,11 @@ msgstr "Nuoroda į poziciją išoriniame plane."
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -367,7 +341,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -458,12 +431,6 @@ msgstr "KS struktūra"
 msgid "Product type is service"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "of "
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
@@ -513,6 +480,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -587,13 +559,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -618,6 +583,13 @@ msgstr "KS eilutės"
 msgid "Time before prod."
 msgstr "Laikas prieš gaminimą"
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -711,6 +683,12 @@ msgstr "Spausdinti"
 msgid "Type"
 msgstr "Tipas"
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost of "
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
@@ -728,6 +706,17 @@ msgstr "Per mėnesį"
 msgid "Couldn't find bill of material for product"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of material in "
+"order to manufacture a product, when you have different ways of building the "
+"same product. You can assign several properties to each Bill of Materials. "
+"When a sales person creates a sales order, he can relate it to several "
+"properties and OpenERP will select automatically the BoM to use according "
+"the the needs."
+msgstr ""
+
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
@@ -799,6 +788,14 @@ msgstr ""
 msgid "Manufacturing Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials Components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM is used a "
+"specific component."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
@@ -873,6 +870,11 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr ""
+
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
@@ -966,11 +968,6 @@ msgstr ""
 msgid "Make to stock"
 msgstr "Iš sandėlio"
 
-#. module: mrp
-#: view:board.board:0
-msgid "Work Center Future load"
-msgstr ""
-
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
@@ -1050,11 +1047,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1065,6 +1057,17 @@ msgstr ""
 msgid "Manufacturing Orders in Progress"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each stage of production. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP becomes capable of automatically "
+"deciding on the manufacturing route depending on the needs of the company."
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
@@ -1100,7 +1103,6 @@ msgstr "Baigtos produkcijos vieta"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
-#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 msgid "Resources"
 msgstr ""
 
@@ -1111,7 +1113,7 @@ msgstr "Analitinis žurnalas"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
 msgstr ""
@@ -1128,6 +1130,16 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr "Produkto kiekis"
+
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
@@ -1168,10 +1180,10 @@ msgid "Location where the system will stock the finished products."
 msgstr "Vieta, kurioje talpinami pabaigti produktai ."
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1202,6 +1214,16 @@ msgstr "Kiekvieną dieną"
 msgid "Revisions"
 msgstr "Revizijos"
 
+#. 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."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,priority:0
 #: field:mrp.production.order,priority:0
@@ -1291,6 +1313,14 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allows you to create and manage manufacturing units consisting "
+"of one or several people and/or machines that can be considered as a unit "
+"for capacity and planning forecasting."
+msgstr ""
+
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:0
 #, python-format
@@ -1313,22 +1343,11 @@ msgstr "KS struktūra"
 msgid "Start Date"
 msgstr "Pradžios data"
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr "Valandos sąskaita"
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1339,12 +1358,6 @@ msgstr ""
 msgid "Product Consumed"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Work Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1378,8 +1391,11 @@ msgid "Scheduled date"
 msgstr "Suplanuota data"
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "'Minimum stock rule' material"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp
@@ -1413,6 +1429,12 @@ msgstr "Bendroji sąskaita"
 msgid "SO Number"
 msgstr "Pardavimo užsakymo numeris"
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component Cost of "
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -1433,10 +1455,10 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "Neskubu"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1450,6 +1472,12 @@ msgstr ""
 msgid "Manufacturing Orders To Start"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
@@ -1530,6 +1558,7 @@ msgid "Make to Order"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
 msgstr ""
@@ -1604,12 +1633,6 @@ msgstr "Suplanuoti produktai"
 msgid "Production Products Consommation"
 msgstr "Gamybos produktų vartojimas"
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Total Cost "
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
@@ -1686,7 +1709,6 @@ msgid "Time for 1 cycle (hour)"
 msgstr "Laikas vienam ciklui (valandomis)"
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1763,6 +1785,14 @@ msgstr "Produkto mat. vnt. kiekis"
 msgid "Valid Until"
 msgstr "Galioja iki"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
@@ -1773,6 +1803,18 @@ msgstr "Patvirtinti"
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -1784,6 +1826,13 @@ msgstr "Produkto apvalinimas"
 msgid "Work Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
@@ -1959,6 +2008,7 @@ msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
 msgstr ""
@@ -2000,6 +2050,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2032,6 +2087,22 @@ msgstr "Bendra informacija"
 msgid "Productions"
 msgstr "Gamyba"
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bill of Materials allows you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoM in order to propose automatically manufacturing orders according "
+"to products' needs. You can either create a bill of materials to define "
+"specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2055,6 +2126,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2066,6 +2142,11 @@ msgstr "Gamyba"
 msgid "Procurements in Exception"
 msgstr ""
 
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
@@ -2124,6 +2205,14 @@ msgstr ""
 msgid "Scheduled End Date"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
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/i18n/nl.po b/addons/mrp/i18n/nl.po
index 1aeda3fe0db..d1c6a16d746 100644
--- a/addons/mrp/i18n/nl.po
+++ b/addons/mrp/i18n/nl.po
@@ -6,20 +6,21 @@ 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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-27 12:23+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-11-28 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
-msgstr ""
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Gegenereerde boekingen"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -47,21 +48,15 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
-msgstr "Gegenereerde boekingen"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
 msgstr "Manufacturing Resource Planning"
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de actie-definitie."
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -191,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr "Set / Pack"
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -226,11 +209,6 @@ msgstr ""
 msgid "UOM"
 msgstr "ME"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
 msgid ""
@@ -314,12 +292,6 @@ msgstr "Geplande materialen"
 msgid "Sets / Phantom"
 msgstr "Sets / Phantom"
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr "Niet urgent"
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -330,6 +302,11 @@ msgstr "Refereert aan een positie in een extern plan."
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -340,11 +317,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
@@ -368,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -508,6 +479,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -582,13 +558,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -613,6 +582,13 @@ msgstr "Stuklijstregels"
 msgid "Time before prod."
 msgstr "Tijd vóór prod."
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -1070,11 +1046,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1208,10 +1179,10 @@ msgid "Location where the system will stock the finished products."
 msgstr "Locatie waar de eindproducten opgeslagen worden"
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1258,11 +1229,6 @@ msgstr ""
 msgid "Priority"
 msgstr "Prioriteit"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
@@ -1381,11 +1347,6 @@ msgstr "Startdatum"
 msgid "Hour Account"
 msgstr "Kostenplaats uren"
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1485,11 +1446,6 @@ msgstr "Gereed"
 msgid "Change Standard Price"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
@@ -1498,11 +1454,10 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: 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 karakters bevatten !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "Niet urgent"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1850,6 +1805,18 @@ msgstr "Bevestigen"
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -2085,6 +2052,11 @@ msgstr ""
 msgid "Error"
 msgstr "Fout"
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2133,11 +2105,6 @@ msgid ""
 "specific production steps or define a single multi-level bill of materials."
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2161,6 +2128,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2471,6 +2443,11 @@ msgstr ""
 #~ msgid "Tool"
 #~ msgstr "Gereedschap"
 
+#~ 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 karakters bevatten !"
+
 #~ msgid "Purchase Order"
 #~ msgstr "Inkooporder"
 
@@ -2707,6 +2684,9 @@ msgstr ""
 #~ msgid "You can see its bill of material which are used to make product"
 #~ msgstr "U kunt de gebruikte materiaallijst zien voor het te maken product."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ongeldige modelnaam in de actie-definitie."
+
 #~ msgid ""
 #~ "Triggers an automatic procurement for all products that have a virtual stock "
 #~ "under 0. You should probably not use this option, we suggest using a MTO "
@@ -2719,6 +2699,9 @@ msgstr ""
 #~ msgid "Exceptions Procurements"
 #~ msgstr "Haperingen in verwervingen"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML voor weergave!"
+
 #~ msgid "Best price (not yet active!)"
 #~ msgstr "Beste prijs (nog niet actief)"
 
diff --git a/addons/mrp/i18n/nl_BE.po b/addons/mrp/i18n/nl_BE.po
index f76706990d3..71a2b490dda 100644
--- a/addons/mrp/i18n/nl_BE.po
+++ b/addons/mrp/i18n/nl_BE.po
@@ -6,19 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-04-20 10:09+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-10-30 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
 msgstr ""
 
 #. module: mrp
@@ -47,9 +48,8 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
 msgstr ""
 
 #. module: mrp
@@ -57,11 +57,6 @@ msgstr ""
 msgid "Manufacturing Resource Planning"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -172,6 +160,15 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allows you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -182,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -218,13 +210,10 @@ msgid "UOM"
 msgstr ""
 
 #. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bills of materials."
 msgstr ""
 
 #. module: mrp
@@ -298,31 +287,11 @@ msgstr ""
 msgid "Scheduled goods"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid ""
-"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None, context=None):\n"
-"        if default is None:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -333,6 +302,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -366,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -454,12 +427,6 @@ msgstr ""
 msgid "Product type is service"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "of "
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
@@ -507,6 +474,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -581,13 +553,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -612,6 +577,13 @@ msgstr ""
 msgid "Time before prod."
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -705,6 +677,12 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost of "
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
@@ -722,6 +700,17 @@ msgstr ""
 msgid "Couldn't find bill of material for product"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of material in "
+"order to manufacture a product, when you have different ways of building the "
+"same product. You can assign several properties to each Bill of Materials. "
+"When a sales person creates a sales order, he can relate it to several "
+"properties and OpenERP will select automatically the BoM to use according "
+"the the needs."
+msgstr ""
+
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
@@ -793,6 +782,14 @@ msgstr ""
 msgid "Manufacturing Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials Components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM is used a "
+"specific component."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
@@ -867,6 +864,11 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr ""
+
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
@@ -960,11 +962,6 @@ msgstr ""
 msgid "Make to stock"
 msgstr ""
 
-#. module: mrp
-#: view:board.board:0
-msgid "Work Center Future load"
-msgstr ""
-
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
@@ -1044,11 +1041,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1059,6 +1051,17 @@ msgstr ""
 msgid "Manufacturing Orders in Progress"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each stage of production. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP becomes capable of automatically "
+"deciding on the manufacturing route depending on the needs of the company."
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
@@ -1094,7 +1097,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
-#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 msgid "Resources"
 msgstr ""
 
@@ -1105,7 +1107,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
 msgstr ""
@@ -1122,6 +1124,16 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
@@ -1162,10 +1174,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1196,6 +1208,16 @@ msgstr ""
 msgid "Revisions"
 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."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,priority:0
 #: field:mrp.production.order,priority:0
@@ -1285,6 +1307,14 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allows you to create and manage manufacturing units consisting "
+"of one or several people and/or machines that can be considered as a unit "
+"for capacity and planning forecasting."
+msgstr ""
+
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:0
 #, python-format
@@ -1307,22 +1337,11 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1333,12 +1352,6 @@ msgstr ""
 msgid "Product Consumed"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Work Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1372,8 +1385,11 @@ msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "'Minimum stock rule' material"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp
@@ -1407,6 +1423,12 @@ msgstr ""
 msgid "SO Number"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component Cost of "
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -1427,11 +1449,10 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
 msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1445,6 +1466,12 @@ msgstr ""
 msgid "Manufacturing Orders To Start"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
@@ -1525,6 +1552,7 @@ msgid "Make to Order"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
 msgstr ""
@@ -1598,12 +1626,6 @@ msgstr ""
 msgid "Production Products Consommation"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Total Cost "
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
@@ -1680,7 +1702,6 @@ msgid "Time for 1 cycle (hour)"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1757,6 +1778,14 @@ msgstr ""
 msgid "Valid Until"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
@@ -1767,6 +1796,18 @@ msgstr ""
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -1778,6 +1819,13 @@ msgstr ""
 msgid "Work Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
@@ -1953,6 +2001,7 @@ msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
 msgstr ""
@@ -1994,6 +2043,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2026,6 +2080,22 @@ msgstr ""
 msgid "Productions"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bill of Materials allows you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoM in order to propose automatically manufacturing orders according "
+"to products' needs. You can either create a bill of materials to define "
+"specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2049,6 +2119,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2060,6 +2135,11 @@ msgstr ""
 msgid "Procurements in Exception"
 msgstr ""
 
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
@@ -2118,6 +2198,14 @@ msgstr ""
 msgid "Scheduled End Date"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
@@ -2217,3 +2305,8 @@ msgstr ""
 #: field:mrp.production.order,year:0
 msgid "Year"
 msgstr ""
+
+#~ 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 karakters bevatten !"
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index f3275813800..373963da803 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -6,20 +6,21 @@ 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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-27 12:37+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-11-28 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
-msgstr "Centra robocze marszruty"
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Utworzone przesunięcia"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -47,21 +48,15 @@ msgid "Work Centers load"
 msgstr "Obłożenie centrum roboczego"
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
-msgstr "Utworzone przesunięcia"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr "Centra robocze marszruty"
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
 msgstr "Planowanie zasobów produkcyjnych (MRP)"
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -76,15 +71,6 @@ msgstr ""
 "'Reguła minimalnego zapasu' pozwala systemowi tworzyć automatycznie "
 "zapotrzebowanie, jak tylko zapas spadnie do określonego minimum."
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-"Jeśli pole Aktywne jest wyłączone, to pozwala ci na ukrycie zestawienia "
-"materiałowego bez jego usuwania."
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -198,11 +184,6 @@ msgstr "Produkty do wyprodukowania"
 msgid "Set / Pack"
 msgstr "Zestaw / Opakowanie"
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -235,11 +216,6 @@ msgstr ""
 msgid "UOM"
 msgstr "JM"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
 msgid ""
@@ -323,12 +299,6 @@ msgstr "Zaplanowane materiały"
 msgid "Sets / Phantom"
 msgstr "Zestaw / Fantom"
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr "Nie pilne"
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -339,6 +309,11 @@ msgstr "Odnośnik do pozycji w planie zewnętrznym"
 msgid "August"
 msgstr "Sierpień"
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -349,11 +324,6 @@ msgstr "Raport zamówień produkcji"
 msgid "June"
 msgstr "Czerwiec"
 
-#. module: mrp
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
@@ -377,7 +347,6 @@ msgstr "Domyślna JM"
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -523,6 +492,11 @@ msgstr ""
 "Zestawienie materiałowe jest związane z marszrutą, a przez marszrutę z "
 "centrami roboczymi."
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -597,15 +571,6 @@ msgstr "Hierarchia zestawienia materiałowego"
 msgid "Produce"
 msgstr "Produkcja"
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-"To jest wewnętrzne pobranie, które przenosi gotowe produkty do planu "
-"produkcji"
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -632,6 +597,13 @@ msgstr "Pozycje Zest. Mat."
 msgid "Time before prod."
 msgstr "Czas przed prod."
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -1097,11 +1069,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr "Ustala kolejność wyświetlania na liście centrów roboczych."
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Reguły nie są obsługiwane dla obiektów osv_memory !"
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1237,13 +1204,13 @@ msgid "Location where the system will stock the finished products."
 msgstr "Strefa, w której system umieści gotowe produkty."
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
-"Jeśli pole Aktywne jest nieaktywne, to możesz ukryć marszrutę bez jej "
-"usuwania."
+"To jest wewnętrzne pobranie, które przenosi gotowe produkty do planu "
+"produkcji"
 
 #. module: mrp
 #: field:stock.change.standard.price,change_parent_price:0
@@ -1292,11 +1259,6 @@ msgstr ""
 msgid "Priority"
 msgstr "Priorytet"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
@@ -1417,11 +1379,6 @@ msgstr "Data początkowa"
 msgid "Hour Account"
 msgstr "Konto dla czasu"
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1521,11 +1478,6 @@ msgstr "Wykonano"
 msgid "Change Standard Price"
 msgstr "Zmień cenę ewidencyjną"
 
-#. module: mrp
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
@@ -1534,12 +1486,10 @@ msgid "Source Document"
 msgstr "Dokument źródłowy"
 
 #. module: mrp
-#: 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 !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "Nie pilne"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1885,6 +1835,18 @@ msgstr "Potwierdź"
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -2120,6 +2082,11 @@ msgstr ""
 msgid "Error"
 msgstr "Błąd"
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2168,11 +2135,6 @@ msgid ""
 "specific production steps or define a single multi-level bill of materials."
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2196,6 +2158,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2378,6 +2345,15 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#~ 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 "Not used in computations, for information purpose only."
 #~ msgstr "Nie używane w obliczeniach, tylko do informacji"
 
@@ -2842,6 +2818,9 @@ msgstr ""
 #~ msgid "Close"
 #~ msgstr "Zamknij"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
 #~ msgid "A purchase order is created for a sub-contracting demand."
 #~ msgstr "Zamówienie zakupu zostało utworzone dla podwykonawcy."
 
@@ -3008,14 +2987,34 @@ msgstr ""
 #~ msgid "Procure Stockable Product"
 #~ msgstr "Zapotrzebowanie na produkty rejestrowane"
 
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the bills of "
+#~ "material without removing it."
+#~ msgstr ""
+#~ "Jeśli pole Aktywne jest wyłączone, to pozwala ci na ukrycie zestawienia "
+#~ "materiałowego bez jego usuwania."
+
 #, python-format
 #~ msgid "of "
 #~ msgstr "z "
 
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Reguły nie są obsługiwane dla obiektów osv_memory !"
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the routing "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Jeśli pole Aktywne jest nieaktywne, to możesz ukryć marszrutę bez jej "
+#~ "usuwania."
+
 #, python-format
 #~ msgid "Work Cost "
 #~ msgstr "Koszt pracy "
 
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
+
 #, python-format
 #~ msgid "Cost "
 #~ msgstr "Koszt "
diff --git a/addons/mrp/i18n/pt.po b/addons/mrp/i18n/pt.po
index 64e8ddf73b7..cd88fb792ed 100644
--- a/addons/mrp/i18n/pt.po
+++ b/addons/mrp/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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index 7b65a7aa0c4..d1c23d25302 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/i18n/pt_BR.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/ro.po b/addons/mrp/i18n/ro.po
index 301a3e146bd..b0ae716b1be 100644
--- a/addons/mrp/i18n/ro.po
+++ b/addons/mrp/i18n/ro.po
@@ -6,19 +6,20 @@ 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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-27 01:22+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-11-28 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
 msgstr ""
 
 #. module: mrp
@@ -47,9 +48,8 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
 msgstr ""
 
 #. module: mrp
@@ -57,11 +57,6 @@ msgstr ""
 msgid "Manufacturing Resource Planning"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -191,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -226,11 +209,6 @@ msgstr ""
 msgid "UOM"
 msgstr "UM"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
 msgid ""
@@ -314,12 +292,6 @@ msgstr ""
 msgid "Sets / Phantom"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -330,6 +302,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -340,11 +317,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
@@ -368,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -503,6 +474,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -577,13 +553,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -608,6 +577,13 @@ msgstr ""
 msgid "Time before prod."
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -1065,11 +1041,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1203,10 +1174,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1253,11 +1224,6 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
@@ -1376,11 +1342,6 @@ msgstr ""
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1480,11 +1441,6 @@ msgstr ""
 msgid "Change Standard Price"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
@@ -1493,9 +1449,9 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
 msgstr ""
 
 #. module: mrp
@@ -1840,6 +1796,18 @@ msgstr ""
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -2075,6 +2043,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2123,11 +2096,6 @@ msgid ""
 "specific production steps or define a single multi-level bill of materials."
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2151,6 +2119,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
diff --git a/addons/mrp/i18n/ru.po b/addons/mrp/i18n/ru.po
index b73a4f8220d..fb6f2099df4 100644
--- a/addons/mrp/i18n/ru.po
+++ b/addons/mrp/i18n/ru.po
@@ -6,20 +6,21 @@ 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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-27 11:08+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-11-28 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
-msgstr ""
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Перемещение создано"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -47,21 +48,15 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
-msgstr "Перемещение создано"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
 msgstr "Планирование материальных ресурсов"
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия"
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -191,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr "Установить / Упаковать"
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -226,11 +209,6 @@ msgstr ""
 msgid "UOM"
 msgstr "Ед. изм."
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
 msgid ""
@@ -314,12 +292,6 @@ msgstr "Запланированные товары"
 msgid "Sets / Phantom"
 msgstr "Ссылка"
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr "Не срочно"
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -330,6 +302,11 @@ msgstr "Позиция на сборочном чертеже или схеме"
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -340,11 +317,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
@@ -368,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -503,6 +474,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -577,13 +553,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -608,6 +577,13 @@ msgstr "Позиции спецификации"
 msgid "Time before prod."
 msgstr "Время до производства"
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -1065,11 +1041,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1203,10 +1174,10 @@ msgid "Location where the system will stock the finished products."
 msgstr "Местоположение, в которое помещаются готовые изделия"
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1253,11 +1224,6 @@ msgstr ""
 msgid "Priority"
 msgstr "Приоритет"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
@@ -1376,11 +1342,6 @@ msgstr "Дата начала"
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1480,11 +1441,6 @@ msgstr "Выполнено"
 msgid "Change Standard Price"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
@@ -1493,12 +1449,10 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "Не срочно"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1843,6 +1797,18 @@ msgstr "Подтвердить"
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -2078,6 +2044,11 @@ msgstr ""
 msgid "Error"
 msgstr "Ошибка"
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2126,11 +2097,6 @@ msgid ""
 "specific production steps or define a single multi-level bill of materials."
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2154,6 +2120,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2342,6 +2313,9 @@ msgstr ""
 #~ msgid "Origin"
 #~ msgstr "Происхождение"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра архитектуры!"
+
 #~ msgid "Product & Location"
 #~ msgstr "Продукция и местоположения"
 
@@ -2447,6 +2421,12 @@ msgstr ""
 #~ msgid "Properties composition"
 #~ msgstr "Составление свойств"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
+
 #~ msgid "Production Orders in Progress"
 #~ msgstr "Исполняемые заказы на производство"
 
@@ -2513,6 +2493,9 @@ msgstr ""
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Правила вычисления минимального запаса"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Недопустимое имя модели в определении действия"
+
 #~ msgid "Exceptions Procurements"
 #~ msgstr "Исключения поставок"
 
diff --git a/addons/mrp/i18n/sk.po b/addons/mrp/i18n/sk.po
index f7a28b078dd..cf03f9b045f 100644
--- a/addons/mrp/i18n/sk.po
+++ b/addons/mrp/i18n/sk.po
@@ -7,19 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-27 12:28+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@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-28 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
 msgstr ""
 
 #. module: mrp
@@ -48,9 +49,8 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
 msgstr ""
 
 #. module: mrp
@@ -58,11 +58,6 @@ msgstr ""
 msgid "Manufacturing Resource Planning"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Neplatný názov modelu v akcii definície."
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -75,13 +70,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -192,11 +180,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr "Sada / Balenie"
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neplatné XML pre zobrazenie architektúry!"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -227,11 +210,6 @@ msgstr ""
 msgid "UOM"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
 msgid ""
@@ -315,12 +293,6 @@ msgstr ""
 msgid "Sets / Phantom"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -331,6 +303,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -341,11 +318,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
@@ -369,7 +341,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -504,6 +475,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -578,13 +554,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -609,6 +578,13 @@ msgstr ""
 msgid "Time before prod."
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -1066,11 +1042,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1204,10 +1175,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1254,11 +1225,6 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
@@ -1377,11 +1343,6 @@ msgstr ""
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1481,11 +1442,6 @@ msgstr ""
 msgid "Change Standard Price"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
@@ -1494,9 +1450,9 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
 msgstr ""
 
 #. module: mrp
@@ -1841,6 +1797,18 @@ msgstr ""
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -2076,6 +2044,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2124,11 +2097,6 @@ msgid ""
 "specific production steps or define a single multi-level bill of materials."
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2152,6 +2120,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2334,6 +2307,9 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neplatný názov modelu v akcii definície."
+
 #~ msgid "Exceptions Procurements"
 #~ msgstr "Výnimky obstarávaní"
 
@@ -2349,5 +2325,8 @@ msgstr ""
 #~ msgid "Product & Location"
 #~ msgstr "Produkt a umiestnenie"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neplatné XML pre zobrazenie architektúry!"
+
 #~ msgid "MRP & Logistics Scheduler"
 #~ msgstr "MRP a plánovač logistiky"
diff --git a/addons/mrp/i18n/sl.po b/addons/mrp/i18n/sl.po
index 87f3031fbd9..c708db5442b 100644
--- a/addons/mrp/i18n/sl.po
+++ b/addons/mrp/i18n/sl.po
@@ -6,19 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-10-30 13:17+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-10-31 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
 msgstr ""
 
 #. module: mrp
@@ -47,9 +48,8 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
 msgstr ""
 
 #. module: mrp
@@ -57,11 +57,6 @@ msgstr ""
 msgid "Manufacturing Resource Planning"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Napačno ime modela v definiciji dejanja."
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -172,6 +160,15 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allows you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -182,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -218,13 +210,10 @@ msgid "UOM"
 msgstr "ME"
 
 #. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bills of materials."
 msgstr ""
 
 #. module: mrp
@@ -298,31 +287,11 @@ msgstr ""
 msgid "Scheduled goods"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid ""
-"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None, context=None):\n"
-"        if default is None:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -333,6 +302,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -366,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -454,12 +427,6 @@ msgstr ""
 msgid "Product type is service"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "of "
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
@@ -507,6 +474,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -581,13 +553,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -612,6 +577,13 @@ msgstr ""
 msgid "Time before prod."
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -705,6 +677,12 @@ msgstr "Natisni"
 msgid "Type"
 msgstr "Tip"
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost of "
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
@@ -722,6 +700,17 @@ msgstr ""
 msgid "Couldn't find bill of material for product"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of material in "
+"order to manufacture a product, when you have different ways of building the "
+"same product. You can assign several properties to each Bill of Materials. "
+"When a sales person creates a sales order, he can relate it to several "
+"properties and OpenERP will select automatically the BoM to use according "
+"the the needs."
+msgstr ""
+
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
@@ -793,6 +782,14 @@ msgstr ""
 msgid "Manufacturing Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials Components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM is used a "
+"specific component."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
@@ -867,6 +864,11 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr ""
+
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
@@ -960,11 +962,6 @@ msgstr ""
 msgid "Make to stock"
 msgstr ""
 
-#. module: mrp
-#: view:board.board:0
-msgid "Work Center Future load"
-msgstr ""
-
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
@@ -1044,11 +1041,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1059,6 +1051,17 @@ msgstr ""
 msgid "Manufacturing Orders in Progress"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each stage of production. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP becomes capable of automatically "
+"deciding on the manufacturing route depending on the needs of the company."
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
@@ -1094,7 +1097,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
-#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 msgid "Resources"
 msgstr ""
 
@@ -1105,7 +1107,7 @@ msgstr "Analitični dnevnik"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
 msgstr ""
@@ -1122,6 +1124,16 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
@@ -1162,10 +1174,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1196,6 +1208,16 @@ msgstr ""
 msgid "Revisions"
 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."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,priority:0
 #: field:mrp.production.order,priority:0
@@ -1285,6 +1307,14 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allows you to create and manage manufacturing units consisting "
+"of one or several people and/or machines that can be considered as a unit "
+"for capacity and planning forecasting."
+msgstr ""
+
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:0
 #, python-format
@@ -1307,22 +1337,11 @@ msgstr ""
 msgid "Start Date"
 msgstr "Datum začetka"
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1333,12 +1352,6 @@ msgstr ""
 msgid "Product Consumed"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Work Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1372,8 +1385,11 @@ msgid "Scheduled date"
 msgstr "Planiran datum"
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "'Minimum stock rule' material"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp
@@ -1407,6 +1423,12 @@ msgstr "Splošni konto"
 msgid "SO Number"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component Cost of "
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -1427,11 +1449,10 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
 msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1445,6 +1466,12 @@ msgstr ""
 msgid "Manufacturing Orders To Start"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
@@ -1525,6 +1552,7 @@ msgid "Make to Order"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
 msgstr ""
@@ -1598,12 +1626,6 @@ msgstr ""
 msgid "Production Products Consommation"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Total Cost "
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
@@ -1680,7 +1702,6 @@ msgid "Time for 1 cycle (hour)"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1757,6 +1778,14 @@ msgstr ""
 msgid "Valid Until"
 msgstr "Veljaven do"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
@@ -1767,6 +1796,18 @@ msgstr "Potrditev"
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -1778,6 +1819,13 @@ msgstr ""
 msgid "Work Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
@@ -1953,6 +2001,7 @@ msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
 msgstr ""
@@ -1994,6 +2043,11 @@ msgstr ""
 msgid "Error"
 msgstr "Napaka"
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2026,6 +2080,22 @@ msgstr "Splošne informacije"
 msgid "Productions"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bill of Materials allows you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoM in order to propose automatically manufacturing orders according "
+"to products' needs. You can either create a bill of materials to define "
+"specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2049,6 +2119,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2060,6 +2135,11 @@ msgstr "Proizvodnja"
 msgid "Procurements in Exception"
 msgstr ""
 
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
@@ -2118,6 +2198,14 @@ msgstr ""
 msgid "Scheduled End Date"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
@@ -2218,6 +2306,14 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
+
 #~ msgid "Origin"
 #~ msgstr "Izvor"
 
@@ -2319,3 +2415,6 @@ msgstr ""
 
 #~ msgid "Running"
 #~ msgstr "V teku"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Napačno ime modela v definiciji dejanja."
diff --git a/addons/mrp/i18n/sq.po b/addons/mrp/i18n/sq.po
index c9e7ac5000b..1fe9a890ab3 100644
--- a/addons/mrp/i18n/sq.po
+++ b/addons/mrp/i18n/sq.po
@@ -7,19 +7,20 @@ 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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-02 14:32+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
 msgstr ""
 
 #. module: mrp
@@ -48,9 +49,8 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
 msgstr ""
 
 #. module: mrp
@@ -58,11 +58,6 @@ msgstr ""
 msgid "Manufacturing Resource Planning"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -75,13 +70,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -173,6 +161,15 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allows you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -183,11 +180,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -219,13 +211,10 @@ msgid "UOM"
 msgstr ""
 
 #. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bills of materials."
 msgstr ""
 
 #. module: mrp
@@ -299,31 +288,11 @@ msgstr ""
 msgid "Scheduled goods"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid ""
-"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None, context=None):\n"
-"        if default is None:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -334,6 +303,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -367,7 +341,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -455,12 +428,6 @@ msgstr ""
 msgid "Product type is service"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "of "
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
@@ -508,6 +475,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -582,13 +554,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -613,6 +578,13 @@ msgstr ""
 msgid "Time before prod."
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -706,6 +678,12 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost of "
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
@@ -723,6 +701,17 @@ msgstr ""
 msgid "Couldn't find bill of material for product"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of material in "
+"order to manufacture a product, when you have different ways of building the "
+"same product. You can assign several properties to each Bill of Materials. "
+"When a sales person creates a sales order, he can relate it to several "
+"properties and OpenERP will select automatically the BoM to use according "
+"the the needs."
+msgstr ""
+
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
@@ -794,6 +783,14 @@ msgstr ""
 msgid "Manufacturing Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials Components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM is used a "
+"specific component."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
@@ -868,6 +865,11 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr ""
+
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
@@ -961,11 +963,6 @@ msgstr ""
 msgid "Make to stock"
 msgstr ""
 
-#. module: mrp
-#: view:board.board:0
-msgid "Work Center Future load"
-msgstr ""
-
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
@@ -1045,11 +1042,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1060,6 +1052,17 @@ msgstr ""
 msgid "Manufacturing Orders in Progress"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each stage of production. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP becomes capable of automatically "
+"deciding on the manufacturing route depending on the needs of the company."
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
@@ -1095,7 +1098,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
-#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 msgid "Resources"
 msgstr ""
 
@@ -1106,7 +1108,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
 msgstr ""
@@ -1123,6 +1125,16 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
@@ -1163,10 +1175,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1197,6 +1209,16 @@ msgstr ""
 msgid "Revisions"
 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."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,priority:0
 #: field:mrp.production.order,priority:0
@@ -1286,6 +1308,14 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allows you to create and manage manufacturing units consisting "
+"of one or several people and/or machines that can be considered as a unit "
+"for capacity and planning forecasting."
+msgstr ""
+
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:0
 #, python-format
@@ -1308,22 +1338,11 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1334,12 +1353,6 @@ msgstr ""
 msgid "Product Consumed"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Work Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1373,8 +1386,11 @@ msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "'Minimum stock rule' material"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp
@@ -1408,6 +1424,12 @@ msgstr ""
 msgid "SO Number"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component Cost of "
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -1428,9 +1450,9 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
 msgstr ""
 
 #. module: mrp
@@ -1445,6 +1467,12 @@ msgstr ""
 msgid "Manufacturing Orders To Start"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
@@ -1525,6 +1553,7 @@ msgid "Make to Order"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
 msgstr ""
@@ -1598,12 +1627,6 @@ msgstr ""
 msgid "Production Products Consommation"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Total Cost "
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
@@ -1680,7 +1703,6 @@ msgid "Time for 1 cycle (hour)"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1757,6 +1779,14 @@ msgstr ""
 msgid "Valid Until"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
@@ -1767,6 +1797,18 @@ msgstr ""
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -1778,6 +1820,13 @@ msgstr ""
 msgid "Work Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
@@ -1953,6 +2002,7 @@ msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
 msgstr ""
@@ -1994,6 +2044,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2026,6 +2081,22 @@ msgstr ""
 msgid "Productions"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bill of Materials allows you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoM in order to propose automatically manufacturing orders according "
+"to products' needs. You can either create a bill of materials to define "
+"specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2049,6 +2120,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2060,6 +2136,11 @@ msgstr ""
 msgid "Procurements in Exception"
 msgstr ""
 
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
@@ -2118,6 +2199,14 @@ msgstr ""
 msgid "Scheduled End Date"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
diff --git a/addons/mrp/i18n/sr@latin.po b/addons/mrp/i18n/sr@latin.po
index 478c72e0f2c..de839174e0c 100644
--- a/addons/mrp/i18n/sr@latin.po
+++ b/addons/mrp/i18n/sr@latin.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/sv.po b/addons/mrp/i18n/sv.po
index 98de1a9461f..5ea8bd67096 100644
--- a/addons/mrp/i18n/sv.po
+++ b/addons/mrp/i18n/sv.po
@@ -6,20 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-23 09:48+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-11-24 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
-msgstr ""
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Moves Created"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -47,21 +48,15 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
-msgstr "Moves Created"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
 msgstr "Manufacturing Resource Planning"
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Invalid model name in the action definition."
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -191,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr "Set / Pack"
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -226,11 +209,6 @@ msgstr ""
 msgid "UOM"
 msgstr "UOM"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
 msgid ""
@@ -314,12 +292,6 @@ msgstr "Scheduled goods"
 msgid "Sets / Phantom"
 msgstr "Sets / Phantom"
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr "Inte bråttom"
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -330,6 +302,11 @@ msgstr "Reference to a position in an external plan."
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -340,11 +317,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
@@ -368,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -508,6 +479,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -582,13 +558,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -613,6 +582,13 @@ msgstr "Materialliste rader"
 msgid "Time before prod."
 msgstr "Time before prod."
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -1070,11 +1046,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1208,10 +1179,10 @@ msgid "Location where the system will stock the finished products."
 msgstr "Location where the system will stock the finished products."
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1258,11 +1229,6 @@ msgstr ""
 msgid "Priority"
 msgstr "Prioritet"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
@@ -1381,11 +1347,6 @@ msgstr "Startdatum"
 msgid "Hour Account"
 msgstr "Hour Account"
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1485,11 +1446,6 @@ msgstr "Klar"
 msgid "Change Standard Price"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
@@ -1498,11 +1454,10 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "Inte bråttom"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1848,6 +1803,18 @@ msgstr "Bekräfta"
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -2083,6 +2050,11 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2131,11 +2103,6 @@ msgid ""
 "specific production steps or define a single multi-level bill of materials."
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2159,6 +2126,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2359,6 +2331,11 @@ msgstr ""
 #~ msgid "Tool"
 #~ msgstr "Verktyg"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
 #~ msgid "Confirmed"
 #~ msgstr "Bekräftad"
 
@@ -2485,6 +2462,9 @@ msgstr ""
 #~ "under 0. You should probably not use this option, we suggest using a MTO "
 #~ "configuration on products."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Invalid model name in the action definition."
+
 #~ msgid "Exceptions Procurements"
 #~ msgstr "Exceptions Procurements"
 
@@ -2515,6 +2495,9 @@ msgstr ""
 #~ msgid "Product name"
 #~ msgstr "Product name"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalid XML for View Architecture!"
+
 #~ msgid ""
 #~ "This is the days added to what you promise to customers for security purpose"
 #~ msgstr ""
diff --git a/addons/mrp/i18n/tlh.po b/addons/mrp/i18n/tlh.po
index 66e50c4d654..61270404201 100644
--- a/addons/mrp/i18n/tlh.po
+++ b/addons/mrp/i18n/tlh.po
@@ -6,19 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\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-10-30 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
 msgstr ""
 
 #. module: mrp
@@ -47,9 +48,8 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
 msgstr ""
 
 #. module: mrp
@@ -57,11 +57,6 @@ msgstr ""
 msgid "Manufacturing Resource Planning"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -172,6 +160,15 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allows you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -182,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -218,13 +210,10 @@ msgid "UOM"
 msgstr ""
 
 #. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bills of materials."
 msgstr ""
 
 #. module: mrp
@@ -298,31 +287,11 @@ msgstr ""
 msgid "Scheduled goods"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid ""
-"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None, context=None):\n"
-"        if default is None:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -333,6 +302,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -366,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -454,12 +427,6 @@ msgstr ""
 msgid "Product type is service"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "of "
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
@@ -507,6 +474,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -581,13 +553,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -612,6 +577,13 @@ msgstr ""
 msgid "Time before prod."
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -705,6 +677,12 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost of "
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
@@ -722,6 +700,17 @@ msgstr ""
 msgid "Couldn't find bill of material for product"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of material in "
+"order to manufacture a product, when you have different ways of building the "
+"same product. You can assign several properties to each Bill of Materials. "
+"When a sales person creates a sales order, he can relate it to several "
+"properties and OpenERP will select automatically the BoM to use according "
+"the the needs."
+msgstr ""
+
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
@@ -793,6 +782,14 @@ msgstr ""
 msgid "Manufacturing Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials Components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM is used a "
+"specific component."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
@@ -867,6 +864,11 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr ""
+
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
@@ -960,11 +962,6 @@ msgstr ""
 msgid "Make to stock"
 msgstr ""
 
-#. module: mrp
-#: view:board.board:0
-msgid "Work Center Future load"
-msgstr ""
-
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
@@ -1044,11 +1041,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1059,6 +1051,17 @@ msgstr ""
 msgid "Manufacturing Orders in Progress"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each stage of production. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP becomes capable of automatically "
+"deciding on the manufacturing route depending on the needs of the company."
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
@@ -1094,7 +1097,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
-#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 msgid "Resources"
 msgstr ""
 
@@ -1105,7 +1107,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
 msgstr ""
@@ -1122,6 +1124,16 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
@@ -1162,10 +1174,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1196,6 +1208,16 @@ msgstr ""
 msgid "Revisions"
 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."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,priority:0
 #: field:mrp.production.order,priority:0
@@ -1285,6 +1307,14 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allows you to create and manage manufacturing units consisting "
+"of one or several people and/or machines that can be considered as a unit "
+"for capacity and planning forecasting."
+msgstr ""
+
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:0
 #, python-format
@@ -1307,22 +1337,11 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1333,12 +1352,6 @@ msgstr ""
 msgid "Product Consumed"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Work Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1372,8 +1385,11 @@ msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "'Minimum stock rule' material"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp
@@ -1407,6 +1423,12 @@ msgstr ""
 msgid "SO Number"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component Cost of "
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -1427,9 +1449,9 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
 msgstr ""
 
 #. module: mrp
@@ -1444,6 +1466,12 @@ msgstr ""
 msgid "Manufacturing Orders To Start"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
@@ -1524,6 +1552,7 @@ msgid "Make to Order"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
 msgstr ""
@@ -1597,12 +1626,6 @@ msgstr ""
 msgid "Production Products Consommation"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Total Cost "
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
@@ -1679,7 +1702,6 @@ msgid "Time for 1 cycle (hour)"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1756,6 +1778,14 @@ msgstr ""
 msgid "Valid Until"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
@@ -1766,6 +1796,18 @@ msgstr ""
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -1777,6 +1819,13 @@ msgstr ""
 msgid "Work Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
@@ -1952,6 +2001,7 @@ msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
 msgstr ""
@@ -1993,6 +2043,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2025,6 +2080,22 @@ msgstr ""
 msgid "Productions"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bill of Materials allows you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoM in order to propose automatically manufacturing orders according "
+"to products' needs. You can either create a bill of materials to define "
+"specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2048,6 +2119,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2059,6 +2135,11 @@ msgstr ""
 msgid "Procurements in Exception"
 msgstr ""
 
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
@@ -2117,6 +2198,14 @@ msgstr ""
 msgid "Scheduled End Date"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index 50c3edee247..f5b310a80e3 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.po
@@ -6,20 +6,21 @@ 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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-27 13:31+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-11-28 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
-msgstr ""
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Oluşan Hareketler"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -47,21 +48,15 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
-msgstr "Oluşan Hareketler"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
 msgstr "Üretim Kaynak Planlaması"
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "İşlem tanımlamasında geçersiz model adı."
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -191,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -226,11 +209,6 @@ msgstr ""
 msgid "UOM"
 msgstr "Birim"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
 msgid ""
@@ -314,12 +292,6 @@ msgstr ""
 msgid "Sets / Phantom"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr "Acil Değil"
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -330,6 +302,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -340,11 +317,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
@@ -368,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -503,6 +474,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -577,13 +553,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -608,6 +577,13 @@ msgstr ""
 msgid "Time before prod."
 msgstr "Üretim Öncesi Süre"
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -1065,11 +1041,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1203,10 +1174,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1253,11 +1224,6 @@ msgstr ""
 msgid "Priority"
 msgstr "Öncelik"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
@@ -1376,11 +1342,6 @@ msgstr "Baş. Tarihi"
 msgid "Hour Account"
 msgstr "Saat Hesabı"
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1480,11 +1441,6 @@ msgstr "Bitti"
 msgid "Change Standard Price"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
@@ -1493,10 +1449,10 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "Acil Değil"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1840,6 +1796,18 @@ msgstr "Onayla"
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -2075,6 +2043,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2123,11 +2096,6 @@ msgid ""
 "specific production steps or define a single multi-level bill of materials."
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2151,6 +2119,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2333,6 +2306,9 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Sadece Minimum Stok Kuralını Hesapla"
 
@@ -2718,6 +2694,9 @@ msgstr ""
 #~ msgid "Bill of Materials Components"
 #~ msgstr "Ürün Ağacı Bileşenleri"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "İşlem tanımlamasında geçersiz model adı."
+
 #~ msgid "Workcenters load"
 #~ msgstr "İş Merkezi Yükü"
 
diff --git a/addons/mrp/i18n/uk.po b/addons/mrp/i18n/uk.po
index e8a72f7e738..945a66a5159 100644
--- a/addons/mrp/i18n/uk.po
+++ b/addons/mrp/i18n/uk.po
@@ -6,20 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 08: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-10-30 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
-msgstr ""
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Створені переміщення"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -47,21 +48,15 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
-msgstr "Створені переміщення"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -172,6 +160,15 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allows you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -182,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури Вигляду!"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -218,14 +210,11 @@ msgid "UOM"
 msgstr "ОВ"
 
 #. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
-msgstr "К-сть"
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bills of materials."
+msgstr ""
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
@@ -298,31 +287,11 @@ msgstr ""
 msgid "Scheduled goods"
 msgstr "Заплановані матеріали"
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid ""
-"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None, context=None):\n"
-"        if default is None:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr "Нетерміновий"
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -333,6 +302,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -366,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -454,12 +427,6 @@ msgstr ""
 msgid "Product type is service"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "of "
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
@@ -507,6 +474,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -581,13 +553,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -612,6 +577,13 @@ msgstr "Рядки СВ"
 msgid "Time before prod."
 msgstr "Час перед в-цтвом"
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -705,6 +677,12 @@ msgstr "Друк"
 msgid "Type"
 msgstr "Тип"
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost of "
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
@@ -722,6 +700,17 @@ msgstr ""
 msgid "Couldn't find bill of material for product"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of material in "
+"order to manufacture a product, when you have different ways of building the "
+"same product. You can assign several properties to each Bill of Materials. "
+"When a sales person creates a sales order, he can relate it to several "
+"properties and OpenERP will select automatically the BoM to use according "
+"the the needs."
+msgstr ""
+
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
@@ -793,6 +782,14 @@ msgstr ""
 msgid "Manufacturing Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials Components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM is used a "
+"specific component."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
@@ -867,6 +864,11 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr ""
+
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
@@ -960,11 +962,6 @@ msgstr ""
 msgid "Make to stock"
 msgstr ""
 
-#. module: mrp
-#: view:board.board:0
-msgid "Work Center Future load"
-msgstr ""
-
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
@@ -1044,11 +1041,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1059,6 +1051,17 @@ msgstr ""
 msgid "Manufacturing Orders in Progress"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each stage of production. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP becomes capable of automatically "
+"deciding on the manufacturing route depending on the needs of the company."
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
@@ -1094,7 +1097,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
-#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 msgid "Resources"
 msgstr ""
 
@@ -1105,7 +1107,7 @@ msgstr "Аналітичний журнал"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
 msgstr ""
@@ -1122,6 +1124,16 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr "К-сть"
+
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
@@ -1162,10 +1174,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1196,6 +1208,16 @@ msgstr ""
 msgid "Revisions"
 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."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,priority:0
 #: field:mrp.production.order,priority:0
@@ -1285,6 +1307,14 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allows you to create and manage manufacturing units consisting "
+"of one or several people and/or machines that can be considered as a unit "
+"for capacity and planning forecasting."
+msgstr ""
+
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:0
 #, python-format
@@ -1307,22 +1337,11 @@ msgstr "Структура СВ"
 msgid "Start Date"
 msgstr "Дата початку"
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr "Рахунок години"
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1333,12 +1352,6 @@ msgstr ""
 msgid "Product Consumed"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Work Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1372,8 +1385,11 @@ msgid "Scheduled date"
 msgstr "Запланована дата"
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "'Minimum stock rule' material"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp
@@ -1407,6 +1423,12 @@ msgstr "Загальний рахунок"
 msgid "SO Number"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component Cost of "
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -1427,11 +1449,10 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "Нетерміновий"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1445,6 +1466,12 @@ msgstr ""
 msgid "Manufacturing Orders To Start"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
@@ -1525,6 +1552,7 @@ msgid "Make to Order"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
 msgstr ""
@@ -1598,12 +1626,6 @@ msgstr ""
 msgid "Production Products Consommation"
 msgstr "Видаток продуктів виробництва"
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Total Cost "
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
@@ -1680,7 +1702,6 @@ msgid "Time for 1 cycle (hour)"
 msgstr "Час на 1 цикл (годин)"
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1757,6 +1778,14 @@ msgstr ""
 msgid "Valid Until"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
@@ -1767,6 +1796,18 @@ msgstr "Затвердити"
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -1778,6 +1819,13 @@ msgstr "Цикл продукту"
 msgid "Work Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
@@ -1953,6 +2001,7 @@ msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
 msgstr ""
@@ -1994,6 +2043,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2026,6 +2080,22 @@ msgstr "Загальне"
 msgid "Productions"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bill of Materials allows you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoM in order to propose automatically manufacturing orders according "
+"to products' needs. You can either create a bill of materials to define "
+"specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2049,6 +2119,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2060,6 +2135,11 @@ msgstr "Виробництво"
 msgid "Procurements in Exception"
 msgstr ""
 
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
@@ -2118,6 +2198,14 @@ msgstr ""
 msgid "Scheduled End Date"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
@@ -2230,6 +2318,9 @@ msgstr ""
 #~ msgid "Automatic orderpoint"
 #~ msgstr "Автоматичний пункт замовлень"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильний XML для Архітектури Вигляду!"
+
 #~ msgid "Best price (not yet active!)"
 #~ msgstr "Найкраща ціна (ще не активна!)"
 
@@ -2356,6 +2447,11 @@ msgstr ""
 #~ msgid "Reordering Mode"
 #~ msgstr "Режим повторної заявки"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
+
 #~ msgid "Production Orders in Progress"
 #~ msgstr "Заявки на виробництво у дії"
 
diff --git a/addons/mrp/i18n/vi.po b/addons/mrp/i18n/vi.po
index 400ea4e17ce..6acb88db0e1 100644
--- a/addons/mrp/i18n/vi.po
+++ b/addons/mrp/i18n/vi.po
@@ -7,19 +7,20 @@ 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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-02 14:32+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-10-30 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
 msgstr ""
 
 #. module: mrp
@@ -48,9 +49,8 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
 msgstr ""
 
 #. module: mrp
@@ -58,11 +58,6 @@ msgstr ""
 msgid "Manufacturing Resource Planning"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -75,13 +70,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -173,6 +161,15 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allows you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -183,11 +180,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -219,13 +211,10 @@ msgid "UOM"
 msgstr ""
 
 #. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bills of materials."
 msgstr ""
 
 #. module: mrp
@@ -299,31 +288,11 @@ msgstr ""
 msgid "Scheduled goods"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid ""
-"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None, context=None):\n"
-"        if default is None:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -334,6 +303,11 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -367,7 +341,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -455,12 +428,6 @@ msgstr ""
 msgid "Product type is service"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "of "
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
@@ -508,6 +475,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -582,13 +554,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -613,6 +578,13 @@ msgstr ""
 msgid "Time before prod."
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -706,6 +678,12 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost of "
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
@@ -723,6 +701,17 @@ msgstr ""
 msgid "Couldn't find bill of material for product"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of material in "
+"order to manufacture a product, when you have different ways of building the "
+"same product. You can assign several properties to each Bill of Materials. "
+"When a sales person creates a sales order, he can relate it to several "
+"properties and OpenERP will select automatically the BoM to use according "
+"the the needs."
+msgstr ""
+
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
@@ -794,6 +783,14 @@ msgstr ""
 msgid "Manufacturing Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials Components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM is used a "
+"specific component."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
@@ -868,6 +865,11 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr ""
+
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
@@ -961,11 +963,6 @@ msgstr ""
 msgid "Make to stock"
 msgstr ""
 
-#. module: mrp
-#: view:board.board:0
-msgid "Work Center Future load"
-msgstr ""
-
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
@@ -1045,11 +1042,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1060,6 +1052,17 @@ msgstr ""
 msgid "Manufacturing Orders in Progress"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each stage of production. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP becomes capable of automatically "
+"deciding on the manufacturing route depending on the needs of the company."
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
@@ -1095,7 +1098,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
-#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 msgid "Resources"
 msgstr ""
 
@@ -1106,7 +1108,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
 msgstr ""
@@ -1123,6 +1125,16 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
@@ -1163,10 +1175,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1197,6 +1209,16 @@ msgstr ""
 msgid "Revisions"
 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."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,priority:0
 #: field:mrp.production.order,priority:0
@@ -1286,6 +1308,14 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allows you to create and manage manufacturing units consisting "
+"of one or several people and/or machines that can be considered as a unit "
+"for capacity and planning forecasting."
+msgstr ""
+
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:0
 #, python-format
@@ -1308,22 +1338,11 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1334,12 +1353,6 @@ msgstr ""
 msgid "Product Consumed"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Work Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1373,8 +1386,11 @@ msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "'Minimum stock rule' material"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp
@@ -1408,6 +1424,12 @@ msgstr ""
 msgid "SO Number"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component Cost of "
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -1428,9 +1450,9 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
 msgstr ""
 
 #. module: mrp
@@ -1445,6 +1467,12 @@ msgstr ""
 msgid "Manufacturing Orders To Start"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
@@ -1525,6 +1553,7 @@ msgid "Make to Order"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
 msgstr ""
@@ -1598,12 +1627,6 @@ msgstr ""
 msgid "Production Products Consommation"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Total Cost "
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
@@ -1680,7 +1703,6 @@ msgid "Time for 1 cycle (hour)"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1757,6 +1779,14 @@ msgstr ""
 msgid "Valid Until"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
@@ -1767,6 +1797,18 @@ msgstr ""
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -1778,6 +1820,13 @@ msgstr ""
 msgid "Work Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
@@ -1953,6 +2002,7 @@ msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
 msgstr ""
@@ -1994,6 +2044,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2026,6 +2081,22 @@ msgstr ""
 msgid "Productions"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bill of Materials allows you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoM in order to propose automatically manufacturing orders according "
+"to products' needs. You can either create a bill of materials to define "
+"specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2049,6 +2120,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2060,6 +2136,11 @@ msgstr ""
 msgid "Procurements in Exception"
 msgstr ""
 
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
@@ -2118,6 +2199,14 @@ msgstr ""
 msgid "Scheduled End Date"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index 22fb3395e3d..a92e4363119 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/i18n/zh_CN.po
@@ -6,20 +6,21 @@ 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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-27 13:32+0000\n"
 "Last-Translator: sagas <sagas@163.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-11-28 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
-msgstr ""
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "创建调拨"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -47,21 +48,15 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
-msgstr "创建调拨"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
 msgstr "MRP(产品需求计划)"
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "在动作定义中使用了无效的模快名。"
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -191,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr "套/包"
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -226,11 +209,6 @@ msgstr ""
 msgid "UOM"
 msgstr "计量单位"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
 msgid ""
@@ -314,12 +292,6 @@ msgstr "安排的货物"
 msgid "Sets / Phantom"
 msgstr "套件/虚项"
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr "不紧急"
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -330,6 +302,11 @@ msgstr "外部计划位置的参考"
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -340,11 +317,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
@@ -368,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -503,6 +474,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -577,13 +553,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -608,6 +577,13 @@ msgstr "物料清单明细"
 msgid "Time before prod."
 msgstr "生产准备时间"
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -1065,11 +1041,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1203,10 +1174,10 @@ msgid "Location where the system will stock the finished products."
 msgstr "系统的成品库存位置 - 库位"
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1253,11 +1224,6 @@ msgstr ""
 msgid "Priority"
 msgstr "优先级"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
@@ -1376,11 +1342,6 @@ msgstr "开始日期"
 msgid "Hour Account"
 msgstr "时间科目"
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1480,11 +1441,6 @@ msgstr "完成"
 msgid "Change Standard Price"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
@@ -1493,10 +1449,10 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "不紧急"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1840,6 +1796,18 @@ msgstr "确定"
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -2075,6 +2043,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2123,11 +2096,6 @@ msgid ""
 "specific production steps or define a single multi-level bill of materials."
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2151,6 +2119,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2654,6 +2627,9 @@ msgstr ""
 #~ "    *库存预测\n"
 #~ "    "
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效XML视图结构!"
+
 #~ msgid "Best price (not yet active!)"
 #~ msgstr "最优价(尚未激活!)"
 
@@ -2860,6 +2836,10 @@ msgstr ""
 #~ msgid "The procurement quantity will by rounded up to this multiple."
 #~ msgstr "产品需求数量将在这个倍数范围内."
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+
 #~ msgid "Central document to procure products"
 #~ msgstr "获得产品的主单据"
 
@@ -3001,6 +2981,9 @@ msgstr ""
 #~ "configuration on products."
 #~ msgstr "对所有虚拟库存为小于0产品自动备货.你或许不应该使用这个选项.建议你使用产品按单生产(MTO)的设置"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "在动作定义中使用了无效的模快名。"
+
 #~ msgid "Exceptions Procurements"
 #~ msgstr "异常备货单"
 
diff --git a/addons/mrp/i18n/zh_HK.po b/addons/mrp/i18n/zh_HK.po
index d0ebcb7a6bb..390b38d67e5 100644
--- a/addons/mrp/i18n/zh_HK.po
+++ b/addons/mrp/i18n/zh_HK.po
@@ -7,20 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-27 13:27+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Chinese (Hong Kong) <zh_HK@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-28 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
-msgstr ""
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "成功創建調撥"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -48,21 +49,15 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
-msgstr "成功創建調撥"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
 msgstr "生產資源計劃"
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "操作定義中使用了無效的模式名稱。"
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -75,13 +70,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -192,11 +180,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr "套 / 包"
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "無效的XML視圖結構!"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -227,11 +210,6 @@ msgstr ""
 msgid "UOM"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
 msgid ""
@@ -315,12 +293,6 @@ msgstr "預定之貨品"
 msgid "Sets / Phantom"
 msgstr "套件 / 虛項"
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr "不緊急"
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -331,6 +303,11 @@ msgstr "於外部計劃中之位置的引用。"
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -341,11 +318,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
@@ -369,7 +341,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -504,6 +475,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -578,13 +554,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -609,6 +578,13 @@ msgstr "物料清單明細"
 msgid "Time before prod."
 msgstr "生產前的時間"
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -1066,11 +1042,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1204,10 +1175,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1254,11 +1225,6 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
@@ -1377,11 +1343,6 @@ msgstr ""
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1481,11 +1442,6 @@ msgstr ""
 msgid "Change Standard Price"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
@@ -1494,10 +1450,10 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "不緊急"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1841,6 +1797,18 @@ msgstr ""
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -2076,6 +2044,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2124,11 +2097,6 @@ msgid ""
 "specific production steps or define a single multi-level bill of materials."
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2152,6 +2120,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2337,6 +2310,9 @@ msgstr ""
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "僅計算最少庫存規則"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "操作定義中使用了無效的模式名稱。"
+
 #~ msgid "Not used in computations, for information purpose only."
 #~ msgstr "不是用來計算，僅僅是提供資訊而已。"
 
@@ -2352,6 +2328,9 @@ msgstr ""
 #~ msgid "Exceptions Procurements"
 #~ msgstr "例外的採購"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "無效的XML視圖結構!"
+
 #~ msgid "Automatic orderpoint"
 #~ msgstr "自動訂購點"
 
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index 76a691f5eda..0a733cbede9 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/i18n/zh_TW.po
@@ -6,20 +6,21 @@ 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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-27 13:27+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-11-28 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
-msgstr ""
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "調撥已創建"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -47,21 +48,15 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
-msgstr "調撥已創建"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
 msgstr "生產資源計劃"
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "操作定義中使用了無效的模式名稱。"
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -191,11 +179,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr "套/包"
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "無效的XML視圖結構!"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -226,11 +209,6 @@ msgstr ""
 msgid "UOM"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
 msgid ""
@@ -314,12 +292,6 @@ msgstr "預定之貨品"
 msgid "Sets / Phantom"
 msgstr "套件 / 虛項"
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr "不緊急"
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -330,6 +302,11 @@ msgstr "於外部計劃中之位置的引用。"
 msgid "August"
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -340,11 +317,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
@@ -368,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -503,6 +474,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -577,13 +553,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -608,6 +577,13 @@ msgstr "物料清單明細"
 msgid "Time before prod."
 msgstr "生產前的時間"
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -1065,11 +1041,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1203,10 +1174,10 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1253,11 +1224,6 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
@@ -1376,11 +1342,6 @@ msgstr ""
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1480,11 +1441,6 @@ msgstr ""
 msgid "Change Standard Price"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
@@ -1493,10 +1449,10 @@ msgid "Source Document"
 msgstr ""
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "不緊急"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1840,6 +1796,18 @@ msgstr ""
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -2075,6 +2043,11 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2123,11 +2096,6 @@ msgid ""
 "specific production steps or define a single multi-level bill of materials."
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2151,6 +2119,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2339,6 +2312,9 @@ msgstr ""
 #~ "configuration on products."
 #~ msgstr "為所有虛擬庫存為小於0的產品生成產品請求。您大可不用這個選項，建議您使用貨品訂貨型生產的設置。"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "操作定義中使用了無效的模式名稱。"
+
 #~ msgid "Packing list"
 #~ msgstr "裝箱表"
 
@@ -2354,6 +2330,9 @@ msgstr ""
 #~ msgid "Not used in computations, for information purpose only."
 #~ msgstr "不是用來計算，僅僅是提供資訊而已。"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "無效的XML視圖結構!"
+
 #~ msgid "Automatic orderpoint"
 #~ msgstr "自動訂購點"
 
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/mrp_view.xml b/addons/mrp/mrp_view.xml
index 25eb56673b0..cf491f0d0e6 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -45,7 +45,7 @@
             id="menu_mrp_configuration"
             name="Configuration"
             parent="base.menu_mrp_root"
-            groups="base.group_extended"
+            groups="group_mrp_manager"
             sequence="50" />
 
         <record id="mrp_property_tree_view" model="ir.ui.view">
@@ -664,7 +664,7 @@
 
                             <field colspan="2" name="move_created_ids2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
                                        widget="one2many_list" mode="tree,form" height="275">
-                                   <tree colors="red:scrapped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products" editable="bottom">
+                                   <tree colors="red:scrapped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
                                        <field name="product_id" readonly="1"/>
                                        <field name="product_qty" readonly="1" string="Qty"/>
                                        <field name="product_uom" readonly="1" string="UOM" widget="selection"/>
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/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index dcbf6c866b4..c3b932e6129 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -5,6 +5,9 @@
 "access_mrp_bom","mrp.bom","model_mrp_bom","group_mrp_user",1,1,1,0
 "access_mrp_bom_revision","mrp.bom.revision","model_mrp_bom_revision","group_mrp_user",1,0,0,0
 "access_mrp_production","mrp.production user","model_mrp_production","mrp.group_mrp_user",1,1,1,1
+"access_mrp_production_salesman","mrp.production salesman","model_mrp_production","base.group_sale_salesman",1,1,1,0
+"access_mrp_production_product_line_salesman","mrp.production.product.line salesman","model_mrp_production_product_line","base.group_sale_salesman",1,0,1,0
+"access_mrp_production_workcenter_line_salesman","mrp.production.workcenter.line salesman","model_mrp_production_workcenter_line","base.group_sale_salesman",1,0,1,0
 "access_mrp_property_group","mrp.property.group","procurement.model_mrp_property_group","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_property","mrp.property","procurement.model_mrp_property","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_production_product_line","mrp.production.product.line","model_mrp_production_product_line","mrp.group_mrp_user",1,1,1,1
@@ -12,7 +15,7 @@
 "access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_manager",1,0,0,0
 "access_mrp_routing_manager","mrp.routing.manager","model_mrp_routing","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_routing_workcenter_manager","mrp.routing.workcenter.manager","model_mrp_routing_workcenter","mrp.group_mrp_manager",1,1,1,1
-"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,0,0,1
+"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_bom_revision_manager","mrp.bom.revision.manager","model_mrp_bom_revision","mrp.group_mrp_manager",1,1,1,1
 "access_stock_location_mrp_worker","stock.location mrp_worker","stock.model_stock_location","mrp.group_mrp_user",1,0,0,0
 "access_stock_move_mrp_worker","stock.move mrp_worker","stock.model_stock_move","mrp.group_mrp_user",1,1,1,0
@@ -32,8 +35,8 @@
 "access_product_product_manager","product.product manager","model_product_product","mrp.group_mrp_manager",1,0,0,0
 "access_ir_property_manager","ir.property manager","base.model_ir_property","mrp.group_mrp_manager",1,1,1,1
 "access_account_sequence_fiscalyear","account.sequence.fiscalyear","account.model_account_sequence_fiscalyear","mrp.group_mrp_user",1,1,1,1
-"access_product_product_user","product.product user","model_product_product","mrp.group_mrp_user",1,1,1,1
-"access_product_template_user","product.template user","product.model_product_template","mrp.group_mrp_user",1,1,1,1
+"access_product_product_user","product.product user","model_product_product","mrp.group_mrp_user",1,0,0,0
+"access_product_template_user","product.template user","product.model_product_template","mrp.group_mrp_user",1,0,0,0
 "access_product_uom_user","product.uom user","product.model_product_uom","mrp.group_mrp_user",1,1,1,1
 "access_product_supplierinfo_user","product.supplierinfo user","product.model_product_supplierinfo","mrp.group_mrp_user",1,1,1,1
 "access_res_partner_address","res.partner.address","base.model_res_partner_address","mrp.group_mrp_user",1,1,1,1
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/ar.po b/addons/mrp_jit/i18n/ar.po
index 96df9675aeb..bb7842570d1 100644
--- a/addons/mrp_jit/i18n/ar.po
+++ b/addons/mrp_jit/i18n/ar.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/bg.po b/addons/mrp_jit/i18n/bg.po
index 5873bb38d26..50dc8d46a10 100644
--- a/addons/mrp_jit/i18n/bg.po
+++ b/addons/mrp_jit/i18n/bg.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/bs.po b/addons/mrp_jit/i18n/bs.po
index 96df9675aeb..bb7842570d1 100644
--- a/addons/mrp_jit/i18n/bs.po
+++ b/addons/mrp_jit/i18n/bs.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/ca.po b/addons/mrp_jit/i18n/ca.po
index 0dbac9e9b9e..5745a85c58b 100644
--- a/addons/mrp_jit/i18n/ca.po
+++ b/addons/mrp_jit/i18n/ca.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/cs.po b/addons/mrp_jit/i18n/cs.po
index 55bcd34ebb0..0b042fcfd22 100644
--- a/addons/mrp_jit/i18n/cs.po
+++ b/addons/mrp_jit/i18n/cs.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/da.po b/addons/mrp_jit/i18n/da.po
index 51454e8ad69..8f046d0cddb 100644
--- a/addons/mrp_jit/i18n/da.po
+++ b/addons/mrp_jit/i18n/da.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/de.po b/addons/mrp_jit/i18n/de.po
index 408e92f1a0d..79c32308ab1 100644
--- a/addons/mrp_jit/i18n/de.po
+++ b/addons/mrp_jit/i18n/de.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/el.po b/addons/mrp_jit/i18n/el.po
index 70743233a5f..50990f69e68 100644
--- a/addons/mrp_jit/i18n/el.po
+++ b/addons/mrp_jit/i18n/el.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/mrp_jit/i18n/es.po b/addons/mrp_jit/i18n/es.po
index b7f58962979..7ba15844ac4 100644
--- a/addons/mrp_jit/i18n/es.po
+++ b/addons/mrp_jit/i18n/es.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/es_AR.po b/addons/mrp_jit/i18n/es_AR.po
index 32cd1b4d873..0ce2543b066 100644
--- a/addons/mrp_jit/i18n/es_AR.po
+++ b/addons/mrp_jit/i18n/es_AR.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/es_EC.po b/addons/mrp_jit/i18n/es_EC.po
index a62ec6385fc..91ad3901c50 100644
--- a/addons/mrp_jit/i18n/es_EC.po
+++ b/addons/mrp_jit/i18n/es_EC.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/et.po b/addons/mrp_jit/i18n/et.po
index a49e3d64726..3f8f76e9a4b 100644
--- a/addons/mrp_jit/i18n/et.po
+++ b/addons/mrp_jit/i18n/et.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/fi.po b/addons/mrp_jit/i18n/fi.po
index 8fc2447d02e..05cb26e3284 100644
--- a/addons/mrp_jit/i18n/fi.po
+++ b/addons/mrp_jit/i18n/fi.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/fr.po b/addons/mrp_jit/i18n/fr.po
index 50a26e9d4e3..60fdcec3a67 100644
--- a/addons/mrp_jit/i18n/fr.po
+++ b/addons/mrp_jit/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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/gl.po b/addons/mrp_jit/i18n/gl.po
index 2546d9b2244..5db5f5d1725 100644
--- a/addons/mrp_jit/i18n/gl.po
+++ b/addons/mrp_jit/i18n/gl.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/hr.po b/addons/mrp_jit/i18n/hr.po
index ba4197ac17c..a86f3c9d3f6 100644
--- a/addons/mrp_jit/i18n/hr.po
+++ b/addons/mrp_jit/i18n/hr.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/hu.po b/addons/mrp_jit/i18n/hu.po
index 96df9675aeb..bb7842570d1 100644
--- a/addons/mrp_jit/i18n/hu.po
+++ b/addons/mrp_jit/i18n/hu.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/id.po b/addons/mrp_jit/i18n/id.po
index 841bbb92763..2cd7cd50915 100644
--- a/addons/mrp_jit/i18n/id.po
+++ b/addons/mrp_jit/i18n/id.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/it.po b/addons/mrp_jit/i18n/it.po
index e3de8770227..e884b977001 100644
--- a/addons/mrp_jit/i18n/it.po
+++ b/addons/mrp_jit/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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/kab.po b/addons/mrp_jit/i18n/kab.po
index 20d0940a78e..5f39c955869 100644
--- a/addons/mrp_jit/i18n/kab.po
+++ b/addons/mrp_jit/i18n/kab.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/ko.po b/addons/mrp_jit/i18n/ko.po
index b09888b7491..88da00022d3 100644
--- a/addons/mrp_jit/i18n/ko.po
+++ b/addons/mrp_jit/i18n/ko.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/lt.po b/addons/mrp_jit/i18n/lt.po
index f7843fe7473..7fa70cd1902 100644
--- a/addons/mrp_jit/i18n/lt.po
+++ b/addons/mrp_jit/i18n/lt.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/ml.po b/addons/mrp_jit/i18n/ml.po
index d60b626dbfa..6e21deb277b 100644
--- a/addons/mrp_jit/i18n/ml.po
+++ b/addons/mrp_jit/i18n/ml.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/mn.po b/addons/mrp_jit/i18n/mn.po
index 743ca6ee2be..c3b89f5b06e 100644
--- a/addons/mrp_jit/i18n/mn.po
+++ b/addons/mrp_jit/i18n/mn.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
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/nl.po b/addons/mrp_jit/i18n/nl.po
index 2c429228eb3..caf585dd1e3 100644
--- a/addons/mrp_jit/i18n/nl.po
+++ b/addons/mrp_jit/i18n/nl.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/nl_BE.po b/addons/mrp_jit/i18n/nl_BE.po
index 818c9226910..08463859a97 100644
--- a/addons/mrp_jit/i18n/nl_BE.po
+++ b/addons/mrp_jit/i18n/nl_BE.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/oc.po b/addons/mrp_jit/i18n/oc.po
index 04ceb9c7500..bd185a42b7b 100644
--- a/addons/mrp_jit/i18n/oc.po
+++ b/addons/mrp_jit/i18n/oc.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/pl.po b/addons/mrp_jit/i18n/pl.po
index c0df57609ac..87cdda9ecf2 100644
--- a/addons/mrp_jit/i18n/pl.po
+++ b/addons/mrp_jit/i18n/pl.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/pt.po b/addons/mrp_jit/i18n/pt.po
index e6e4e997e5c..4dae9c0a35e 100644
--- a/addons/mrp_jit/i18n/pt.po
+++ b/addons/mrp_jit/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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/pt_BR.po b/addons/mrp_jit/i18n/pt_BR.po
index 9fb28224f43..9a04828e909 100644
--- a/addons/mrp_jit/i18n/pt_BR.po
+++ b/addons/mrp_jit/i18n/pt_BR.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/ro.po b/addons/mrp_jit/i18n/ro.po
index 96df9675aeb..bb7842570d1 100644
--- a/addons/mrp_jit/i18n/ro.po
+++ b/addons/mrp_jit/i18n/ro.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/ru.po b/addons/mrp_jit/i18n/ru.po
index 9d7a87f89fa..fd809988220 100644
--- a/addons/mrp_jit/i18n/ru.po
+++ b/addons/mrp_jit/i18n/ru.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/sk.po b/addons/mrp_jit/i18n/sk.po
index bf3fadd2046..89b995fd0f1 100644
--- a/addons/mrp_jit/i18n/sk.po
+++ b/addons/mrp_jit/i18n/sk.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/sl.po b/addons/mrp_jit/i18n/sl.po
index 9044daffe78..9d4ca5c6f7c 100644
--- a/addons/mrp_jit/i18n/sl.po
+++ b/addons/mrp_jit/i18n/sl.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/sq.po b/addons/mrp_jit/i18n/sq.po
index 7603bf8abae..f62a292d1f4 100644
--- a/addons/mrp_jit/i18n/sq.po
+++ b/addons/mrp_jit/i18n/sq.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/sr.po b/addons/mrp_jit/i18n/sr.po
index e150a6da4a0..c23ade03030 100644
--- a/addons/mrp_jit/i18n/sr.po
+++ b/addons/mrp_jit/i18n/sr.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/sr@latin.po b/addons/mrp_jit/i18n/sr@latin.po
index ba890dbb63f..b6fba14b424 100644
--- a/addons/mrp_jit/i18n/sr@latin.po
+++ b/addons/mrp_jit/i18n/sr@latin.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/sv.po b/addons/mrp_jit/i18n/sv.po
index be1db9ec8f8..ef28883cd7d 100644
--- a/addons/mrp_jit/i18n/sv.po
+++ b/addons/mrp_jit/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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/ta.po b/addons/mrp_jit/i18n/ta.po
index bc676cdb8a7..aa02fd4c754 100644
--- a/addons/mrp_jit/i18n/ta.po
+++ b/addons/mrp_jit/i18n/ta.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/tr.po b/addons/mrp_jit/i18n/tr.po
index 4b0cfaf5603..d136c5d3448 100644
--- a/addons/mrp_jit/i18n/tr.po
+++ b/addons/mrp_jit/i18n/tr.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/uk.po b/addons/mrp_jit/i18n/uk.po
index fd46d5ad987..3f46b55eb0e 100644
--- a/addons/mrp_jit/i18n/uk.po
+++ b/addons/mrp_jit/i18n/uk.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/vi.po b/addons/mrp_jit/i18n/vi.po
index e785570950c..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-14 05:32+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_jit/i18n/zh_CN.po b/addons/mrp_jit/i18n/zh_CN.po
index c2994e87472..1a2f842adfb 100644
--- a/addons/mrp_jit/i18n/zh_CN.po
+++ b/addons/mrp_jit/i18n/zh_CN.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/zh_TW.po b/addons/mrp_jit/i18n/zh_TW.po
index ffdf2ee06ef..a572d29e0c3 100644
--- a/addons/mrp_jit/i18n/zh_TW.po
+++ b/addons/mrp_jit/i18n/zh_TW.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+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 bb6c966b610..c24e287654e 100644
--- a/addons/mrp_repair/i18n/it.po
+++ b/addons/mrp_repair/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-08-03 08:04+0000\n"
+"PO-Revision-Date: 2010-12-15 05:10+0000\n"
 "Last-Translator: Milo Casagrande <milo@casagrande.name>\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
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/ab.po b/addons/mrp_subproduct/i18n/ab.po
index bd30f07efc7..a69b741d660 100644
--- a/addons/mrp_subproduct/i18n/ab.po
+++ b/addons/mrp_subproduct/i18n/ab.po
@@ -7,24 +7,27 @@ 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-03 15:44+0000\n"
 "PO-Revision-Date: 2009-04-20 09:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Abkhazian <ab@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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -44,13 +47,8 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -79,8 +77,13 @@ msgid "BoM"
 msgstr ""
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -89,9 +92,13 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/ar.po b/addons/mrp_subproduct/i18n/ar.po
index 91ad5674dd3..58c32c0e6ac 100644
--- a/addons/mrp_subproduct/i18n/ar.po
+++ b/addons/mrp_subproduct/i18n/ar.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,13 +46,8 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -78,8 +76,13 @@ msgid "BoM"
 msgstr ""
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -88,9 +91,13 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/bg.po b/addons/mrp_subproduct/i18n/bg.po
index c7908117d05..f677168fadf 100644
--- a/addons/mrp_subproduct/i18n/bg.po
+++ b/addons/mrp_subproduct/i18n/bg.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-02-04 06: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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,13 +46,8 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -78,8 +76,13 @@ msgid "BoM"
 msgstr ""
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -88,14 +91,25 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
-"Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-"символи!"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Невалиден XML за преглед на архитектурата"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
+#~ "символи!"
diff --git a/addons/mrp_subproduct/i18n/bs.po b/addons/mrp_subproduct/i18n/bs.po
index 95595d8e8d8..c6f2a8e9f51 100644
--- a/addons/mrp_subproduct/i18n/bs.po
+++ b/addons/mrp_subproduct/i18n/bs.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 08:08+0000\n"
 "Last-Translator: Miro Glavić <glavicmiro@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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Proizvod"
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,14 +46,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Proizvod"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
-msgstr "polu_proizvodi"
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Poluproizvodi"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -78,9 +76,14 @@ msgid "BoM"
 msgstr "BoM"
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
-msgstr "Poluproizvodi"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "polu_proizvodi"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -88,19 +91,30 @@ msgid "Variable"
 msgstr "Promjenljivo"
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
-"Naziv Objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr "Fiksno"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+
 #~ msgid "MRP Sub Product"
 #~ msgstr "MRP Poluproizvod"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv Objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
+
 #~ msgid "Mrp Sub Product"
 #~ msgstr "Mrp Poluproizvod"
diff --git a/addons/mrp_subproduct/i18n/ca.po b/addons/mrp_subproduct/i18n/ca.po
index 377e7d4037d..f98bb0ae2dd 100644
--- a/addons/mrp_subproduct/i18n/ca.po
+++ b/addons/mrp_subproduct/i18n/ca.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 08:08+0000\n"
 "Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Producte"
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,14 +46,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Producte"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
-msgstr "sub_productes"
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sub productes"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -78,9 +76,14 @@ msgid "BoM"
 msgstr "Llista de materials (LdM)"
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
-msgstr "Sub productes"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_productes"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -88,12 +91,14 @@ msgid "Variable"
 msgstr "Variable"
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
-"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-"especial!"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -103,5 +108,14 @@ msgstr "Fixe"
 #~ msgid "MRP Sub Product"
 #~ msgstr "MRP subproducte"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invàlid per a la definició de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+#~ "especial!"
+
 #~ msgid "Mrp Sub Product"
 #~ msgstr "Sub producte MRP"
diff --git a/addons/mrp_subproduct/i18n/cs.po b/addons/mrp_subproduct/i18n/cs.po
index 9bc11173bef..2fbceb82a75 100644
--- a/addons/mrp_subproduct/i18n/cs.po
+++ b/addons/mrp_subproduct/i18n/cs.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-11-17 07:16+0000\n"
 "Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalidní XML pro zobrazení architektury!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produkt"
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,14 +46,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
-msgstr "pod_produkty"
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Podprodukty"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -78,9 +76,14 @@ msgid "BoM"
 msgstr "BoM"
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
-msgstr "Podprodukty"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "pod_produkty"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -88,17 +91,28 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
-"Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalidní XML pro zobrazení architektury!"
+
 #~ msgid "Mrp Sub Product"
 #~ msgstr "Mrp podprodukt"
 
diff --git a/addons/mrp_subproduct/i18n/de.po b/addons/mrp_subproduct/i18n/de.po
index faae1662e92..b082fcd729c 100644
--- a/addons/mrp_subproduct/i18n/de.po
+++ b/addons/mrp_subproduct/i18n/de.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/es.po b/addons/mrp_subproduct/i18n/es.po
index d72a3e2b08a..8f79973fb04 100644
--- a/addons/mrp_subproduct/i18n/es.po
+++ b/addons/mrp_subproduct/i18n/es.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/es_AR.po b/addons/mrp_subproduct/i18n/es_AR.po
index a7a43ebbdf0..f839c118c9c 100644
--- a/addons/mrp_subproduct/i18n/es_AR.po
+++ b/addons/mrp_subproduct/i18n/es_AR.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-09-15 20:10+0000\n"
 "Last-Translator: Diego Cohen <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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Producto"
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,14 +46,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
-msgstr "sub_productos"
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sub Producto"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -78,9 +76,14 @@ msgid "BoM"
 msgstr "Lista de materiales (LdM)"
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
-msgstr "Sub Producto"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_productos"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -88,12 +91,14 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
-"especial!"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
diff --git a/addons/mrp_subproduct/i18n/es_EC.po b/addons/mrp_subproduct/i18n/es_EC.po
index 65612ef8e11..5c608be0f80 100644
--- a/addons/mrp_subproduct/i18n/es_EC.po
+++ b/addons/mrp_subproduct/i18n/es_EC.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-19 00:06+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Producto"
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,14 +46,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
-msgstr "sub_productos"
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sub productos"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -78,9 +76,14 @@ msgid "BoM"
 msgstr "Lista de materiales (LdM)"
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
-msgstr "Sub productos"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_productos"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -88,12 +91,14 @@ msgid "Variable"
 msgstr "Variable"
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
diff --git a/addons/mrp_subproduct/i18n/et.po b/addons/mrp_subproduct/i18n/et.po
index ca26b3a9b73..a8d499b5537 100644
--- a/addons/mrp_subproduct/i18n/et.po
+++ b/addons/mrp_subproduct/i18n/et.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-11-09 18:57+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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Toode"
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,14 +46,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Toode"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
-msgstr "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Alamtooted"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -78,9 +76,14 @@ msgid "BoM"
 msgstr "Materjaliandmik"
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
-msgstr "Alamtooted"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_products"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -88,17 +91,28 @@ msgid "Variable"
 msgstr "Muutuv"
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
-"Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr "Fikseeritud"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Vigane XML vaate arhitektuurile!"
+
+#~ 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 "Mrp Sub Product"
 #~ msgstr "TVP alamtoode"
 
diff --git a/addons/mrp_subproduct/i18n/fi.po b/addons/mrp_subproduct/i18n/fi.po
index c97bbf6d6b2..89bff5f28eb 100644
--- a/addons/mrp_subproduct/i18n/fi.po
+++ b/addons/mrp_subproduct/i18n/fi.po
@@ -7,24 +7,27 @@ 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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 08:08+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: Finnish <fi@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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Tuote"
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -44,13 +47,8 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Tuote"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -79,8 +77,13 @@ msgid "BoM"
 msgstr ""
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -89,12 +92,23 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr "Ennalta määrätty"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
diff --git a/addons/mrp_subproduct/i18n/fr.po b/addons/mrp_subproduct/i18n/fr.po
index 80435d15eb8..401e9962bf7 100644
--- a/addons/mrp_subproduct/i18n/fr.po
+++ b/addons/mrp_subproduct/i18n/fr.po
@@ -6,36 +6,29 @@ 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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-12-01 14:12+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-02 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produit"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
-#. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
-msgstr "Sous-produit"
-
-#. module: mrp_subproduct
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Le nom d'un module doit être unique !"
-
 #. module: mrp_subproduct
 #: view:mrp.bom:0
 msgid "sub products"
@@ -55,14 +48,9 @@ msgstr ""
 "à partir d'un seul ordre de fabrication"
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Produit"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
-msgstr "Sous-produits"
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sous-produit"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -90,9 +78,14 @@ msgid "BoM"
 msgstr "Nomenclature"
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
-msgstr "Sous-produit"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "Sous-produits"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -100,19 +93,28 @@ msgid "Variable"
 msgstr "Variable"
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
 msgstr ""
-"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
-"spéciaux !"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Sous-produit"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr "Fixe"
 
-#. module: mrp_subproduct
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "La taille du champ ne doit jamais être inférieure à 1 !"
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+#~ "spéciaux !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Le nom d'un module doit être unique !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "La taille du champ ne doit jamais être inférieure à 1 !"
diff --git a/addons/mrp_subproduct/i18n/hr.po b/addons/mrp_subproduct/i18n/hr.po
index d358ccf2083..2216fb72b6e 100644
--- a/addons/mrp_subproduct/i18n/hr.po
+++ b/addons/mrp_subproduct/i18n/hr.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 08:08+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za arhitekturu prikaza!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Proizvod"
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,14 +46,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Proizvod"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
-msgstr "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Podproizvodi"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -78,9 +76,14 @@ msgid "BoM"
 msgstr "Sastavnica"
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
-msgstr "Podproizvodi"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_products"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -88,17 +91,28 @@ msgid "Variable"
 msgstr "Varijabla"
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
-"Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr "Određeno"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nevažeći XML za arhitekturu prikaza!"
+
 #~ msgid "Mrp Sub Product"
 #~ msgstr "MRP podproizvod"
 
diff --git a/addons/mrp_subproduct/i18n/hu.po b/addons/mrp_subproduct/i18n/hu.po
index 91ad5674dd3..58c32c0e6ac 100644
--- a/addons/mrp_subproduct/i18n/hu.po
+++ b/addons/mrp_subproduct/i18n/hu.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,13 +46,8 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -78,8 +76,13 @@ msgid "BoM"
 msgstr ""
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -88,9 +91,13 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/id.po b/addons/mrp_subproduct/i18n/id.po
index aa61263f183..bd18660c0fd 100644
--- a/addons/mrp_subproduct/i18n/id.po
+++ b/addons/mrp_subproduct/i18n/id.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-11-09 13:52+0000\n"
 "Last-Translator: <>\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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,13 +46,8 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -78,8 +76,13 @@ msgid "BoM"
 msgstr ""
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -88,9 +91,13 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/it.po b/addons/mrp_subproduct/i18n/it.po
index 0e1e2741fbd..0d187c81f81 100644
--- a/addons/mrp_subproduct/i18n/it.po
+++ b/addons/mrp_subproduct/i18n/it.po
@@ -6,25 +6,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-02 07: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-11-03 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per l'Achitettura della Vista"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Prodotto"
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
-msgstr "Sotto Prodotto"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -44,14 +47,9 @@ msgstr ""
 "MRP Sub Product - Produzione di n prodotti da un singolo ordine di produzione"
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Prodotto"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
-msgstr "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sotto prodotti"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -79,9 +77,14 @@ msgid "BoM"
 msgstr "Distinta base"
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
-msgstr "Sotto prodotti"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_products"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -89,20 +92,31 @@ msgid "Variable"
 msgstr "Variabile"
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
 msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Sotto Prodotto"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr "Fissato"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
+
 #~ msgid "Mrp Sub Product"
 #~ msgstr "MRP Sotto Prodotti"
 
 #~ msgid "MRP Sub Product"
 #~ msgstr "MRP Sotto Prodotto"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per l'Achitettura della Vista"
diff --git a/addons/mrp_subproduct/i18n/ko.po b/addons/mrp_subproduct/i18n/ko.po
index 40bad26da2a..4ad7a3dab22 100644
--- a/addons/mrp_subproduct/i18n/ko.po
+++ b/addons/mrp_subproduct/i18n/ko.po
@@ -7,24 +7,27 @@ 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-03 15:44+0000\n"
 "PO-Revision-Date: 2009-09-08 16:48+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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "상품"
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -44,14 +47,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "상품"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
-msgstr "하위 상품들 (s)"
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "하위 상품들"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -79,9 +77,14 @@ msgid "BoM"
 msgstr "BoM"
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
-msgstr "하위 상품들"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "하위 상품들 (s)"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -89,10 +92,14 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자가 포함되면 안됩니다."
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -104,3 +111,10 @@ msgstr ""
 
 #~ msgid "MRP Sub Product"
 #~ msgstr "MRP  하위 상품"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자가 포함되면 안됩니다."
diff --git a/addons/mrp_subproduct/i18n/lt.po b/addons/mrp_subproduct/i18n/lt.po
index 91ad5674dd3..58c32c0e6ac 100644
--- a/addons/mrp_subproduct/i18n/lt.po
+++ b/addons/mrp_subproduct/i18n/lt.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,13 +46,8 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -78,8 +76,13 @@ msgid "BoM"
 msgstr ""
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -88,9 +91,13 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/mn.po b/addons/mrp_subproduct/i18n/mn.po
index 11d44c9d3bb..67aeea538a4 100644
--- a/addons/mrp_subproduct/i18n/mn.po
+++ b/addons/mrp_subproduct/i18n/mn.po
@@ -7,24 +7,27 @@ 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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-14 08:43+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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Дэлгэцийн XML алдаатай!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Бүтээгдэхүүн"
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -44,14 +47,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Бүтээгдэхүүн"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
-msgstr "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Хоёрдогч бүтээгдэхүүнүүд"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -79,9 +77,14 @@ msgid "BoM"
 msgstr "Материалын тооцоо"
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
-msgstr "Хоёрдогч бүтээгдэхүүнүүд"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_products"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -89,18 +92,29 @@ msgid "Variable"
 msgstr "Хувьсах"
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
-"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-"болохгүй!"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 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 "Mrp Sub Product"
 #~ msgstr "Хоёрдогч бүтээгдэхүүн"
 
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/i18n/nl.po b/addons/mrp_subproduct/i18n/nl.po
index 703ab123da3..35149f3de7d 100644
--- a/addons/mrp_subproduct/i18n/nl.po
+++ b/addons/mrp_subproduct/i18n/nl.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-01-28 22:58+0000\n"
 "Last-Translator: Freerk Kalsbeek (Mindswitch BV) <f.kalsbeek@mindswitch.nl>\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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor overzicht"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Product"
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,14 +46,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Product"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
-msgstr "Deelproducten"
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Deel producten"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -78,9 +76,14 @@ msgid "BoM"
 msgstr "Stuklijst"
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
-msgstr "Deel producten"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "Deelproducten"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -88,17 +91,28 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML voor overzicht"
+
+#~ 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 karakters bevatten !"
+
 #~ msgid "Mrp Sub Product"
 #~ msgstr "Mrp Deelproduct"
 
diff --git a/addons/mrp_subproduct/i18n/nl_BE.po b/addons/mrp_subproduct/i18n/nl_BE.po
index 0e8ef1f7e1e..c8818217c2c 100644
--- a/addons/mrp_subproduct/i18n/nl_BE.po
+++ b/addons/mrp_subproduct/i18n/nl_BE.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-04-10 08:37+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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,13 +46,8 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -78,8 +76,13 @@ msgid "BoM"
 msgstr ""
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -88,13 +91,21 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr ""
+
+#~ 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 karakters bevatten !"
diff --git a/addons/mrp_subproduct/i18n/oc.po b/addons/mrp_subproduct/i18n/oc.po
index e59bf4b97fc..dbb069bced4 100644
--- a/addons/mrp_subproduct/i18n/oc.po
+++ b/addons/mrp_subproduct/i18n/oc.po
@@ -7,24 +7,27 @@ 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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 08:11+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invalid per l'arquitectura de la vista"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produch"
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -44,13 +47,8 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Produch"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -79,8 +77,13 @@ msgid "BoM"
 msgstr "Nomenclatura"
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -89,9 +92,13 @@ msgid "Variable"
 msgstr "Variabla"
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -99,5 +106,8 @@ msgstr ""
 msgid "Fixed"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invalid per l'arquitectura de la vista"
+
 #~ msgid "Mrp Sub Product"
 #~ msgstr "Components per MRP"
diff --git a/addons/mrp_subproduct/i18n/pl.po b/addons/mrp_subproduct/i18n/pl.po
index 96e434f036b..07fe4407449 100644
--- a/addons/mrp_subproduct/i18n/pl.po
+++ b/addons/mrp_subproduct/i18n/pl.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-11-17 07:11+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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produkt"
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,14 +46,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
-msgstr ""
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Produkty uboczne"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -78,9 +76,14 @@ msgid "BoM"
 msgstr "Zest. Mat."
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
-msgstr "Produkty uboczne"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr ""
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -88,18 +91,29 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
-"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-"specjalnych !"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#~ 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 "Mrp Sub Product"
 #~ msgstr "Produkt uboczny MRP"
 
diff --git a/addons/mrp_subproduct/i18n/pt.po b/addons/mrp_subproduct/i18n/pt.po
index b9f4f1a8141..30f2ddb092f 100644
--- a/addons/mrp_subproduct/i18n/pt.po
+++ b/addons/mrp_subproduct/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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/pt_BR.po b/addons/mrp_subproduct/i18n/pt_BR.po
index fe89a53ebd3..a41affe7f18 100644
--- a/addons/mrp_subproduct/i18n/pt_BR.po
+++ b/addons/mrp_subproduct/i18n/pt_BR.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-09-08 16:19+0000\n"
 "Last-Translator: Aldo Giovani <aldogiovani@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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,13 +46,8 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -78,8 +76,13 @@ msgid "BoM"
 msgstr ""
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -88,14 +91,25 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
-"O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-"especial!"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalido XML para Arquitetura da View"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
+#~ "especial!"
diff --git a/addons/mrp_subproduct/i18n/ro.po b/addons/mrp_subproduct/i18n/ro.po
index d8a2fe09d62..6921adefdbb 100644
--- a/addons/mrp_subproduct/i18n/ro.po
+++ b/addons/mrp_subproduct/i18n/ro.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-09-08 16:33+0000\n"
 "Last-Translator: filsys <office@filsystem.ro>\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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,13 +46,8 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -78,8 +76,13 @@ msgid "BoM"
 msgstr ""
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -88,9 +91,13 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/ru.po b/addons/mrp_subproduct/i18n/ru.po
index a90eae1b7c5..f32fa05cb75 100644
--- a/addons/mrp_subproduct/i18n/ru.po
+++ b/addons/mrp_subproduct/i18n/ru.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-02-04 06:32+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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,13 +46,8 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -78,8 +76,13 @@ msgid "BoM"
 msgstr ""
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -88,14 +91,25 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра архитектуры!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
diff --git a/addons/mrp_subproduct/i18n/sk.po b/addons/mrp_subproduct/i18n/sk.po
index 6f4f2414f30..ed9b06922d0 100644
--- a/addons/mrp_subproduct/i18n/sk.po
+++ b/addons/mrp_subproduct/i18n/sk.po
@@ -7,24 +7,27 @@ 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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 09:01+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neplatná XML pre zobrazenie architektúry!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produkt"
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -44,13 +47,8 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -79,8 +77,13 @@ msgid "BoM"
 msgstr ""
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -89,12 +92,19 @@ msgid "Variable"
 msgstr "Premenná"
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr "Pevný"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neplatná XML pre zobrazenie architektúry!"
diff --git a/addons/mrp_subproduct/i18n/sl.po b/addons/mrp_subproduct/i18n/sl.po
index 4e4be2537a1..e6af441245e 100644
--- a/addons/mrp_subproduct/i18n/sl.po
+++ b/addons/mrp_subproduct/i18n/sl.po
@@ -6,35 +6,28 @@ 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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-26 23: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-11-28 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Oznaka certifikata modula mora biti enolična!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Proizvod"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
-msgstr "Del proizvoda"
-
-#. module: mrp_subproduct
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Ime modula mora biti enolično!"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -53,14 +46,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Proizvod"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
-msgstr "polproizvod"
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Polproizvod"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -88,9 +76,14 @@ msgid "BoM"
 msgstr "kosovnica"
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
-msgstr "Polproizvod"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "polproizvod"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -98,24 +91,39 @@ msgid "Variable"
 msgstr "Spremenljivka"
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
 msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Del proizvoda"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr "Stalno"
 
-#. module: mrp_subproduct
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Dolžina polja ne sme biti nikoli manj od 1!"
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
 
 #~ msgid "Mrp Sub Product"
 #~ msgstr "Načrtovanje virov materiala za polproizvod"
 
 #~ msgid "MRP Sub Product"
 #~ msgstr "Načrtovanje virov materiala za polproizvod"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Dolžina polja ne sme biti nikoli manj od 1!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Ime modula mora biti enolično!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Oznaka certifikata modula mora biti enolična!"
diff --git a/addons/mrp_subproduct/i18n/sq.po b/addons/mrp_subproduct/i18n/sq.po
index 5683e682ded..eb4ac07b722 100644
--- a/addons/mrp_subproduct/i18n/sq.po
+++ b/addons/mrp_subproduct/i18n/sq.po
@@ -7,24 +7,27 @@ 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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-02 14:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -44,13 +47,8 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -79,8 +77,13 @@ msgid "BoM"
 msgstr ""
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -89,9 +92,13 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/sr.po b/addons/mrp_subproduct/i18n/sr.po
index 3008c355f91..f8be959b9b0 100644
--- a/addons/mrp_subproduct/i18n/sr.po
+++ b/addons/mrp_subproduct/i18n/sr.po
@@ -7,25 +7,28 @@ 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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-04 08:53+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-06 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za pregled arhitekture"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Proizvod"
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
-msgstr "SubProizvod"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -46,14 +49,9 @@ msgstr ""
 "zahteva"
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Proizvod"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
-msgstr "pod_proizvod"
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Pod proizvodi"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -81,9 +79,14 @@ msgid "BoM"
 msgstr "BoM"
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
-msgstr "Pod proizvodi"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "pod_proizvod"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -91,17 +94,28 @@ msgid "Variable"
 msgstr "Promjenljiva"
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
 msgstr ""
-"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "SubProizvod"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr "Fiksno"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nevažeći XML za pregled arhitekture"
+
 #~ msgid "Mrp Sub Product"
 #~ msgstr "Mrp Pod Proizvod"
 
diff --git a/addons/mrp_subproduct/i18n/sr@latin.po b/addons/mrp_subproduct/i18n/sr@latin.po
index d9320af5dd9..510eabd6c9e 100644
--- a/addons/mrp_subproduct/i18n/sr@latin.po
+++ b/addons/mrp_subproduct/i18n/sr@latin.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-11 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/sv.po b/addons/mrp_subproduct/i18n/sv.po
index 046b4bba933..2d6b68d3a04 100644
--- a/addons/mrp_subproduct/i18n/sv.po
+++ b/addons/mrp_subproduct/i18n/sv.po
@@ -6,34 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-23 09: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-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produkt"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Felaktig XML för Vyarkitektur!"
-
-#. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
-msgstr ""
-
-#. module: mrp_subproduct
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -53,13 +46,8 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -88,8 +76,13 @@ msgid "BoM"
 msgstr ""
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -98,21 +91,27 @@ msgid "Variable"
 msgstr "Variabel"
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr "Rättad"
 
-#. module: mrp_subproduct
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Felaktig XML för Vyarkitektur!"
 
 #~ msgid "MRP Sub Product"
 #~ msgstr "MRP Sub Product"
diff --git a/addons/mrp_subproduct/i18n/tlh.po b/addons/mrp_subproduct/i18n/tlh.po
index 3e9e399574c..57eb11c9186 100644
--- a/addons/mrp_subproduct/i18n/tlh.po
+++ b/addons/mrp_subproduct/i18n/tlh.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,13 +46,8 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -78,8 +76,13 @@ msgid "BoM"
 msgstr ""
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -88,9 +91,13 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/tr.po b/addons/mrp_subproduct/i18n/tr.po
index 4ef875d16cb..a7f871bf578 100644
--- a/addons/mrp_subproduct/i18n/tr.po
+++ b/addons/mrp_subproduct/i18n/tr.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-09 07:20+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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Ürün"
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,14 +46,9 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Ürün"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
-msgstr "Alt_Ürünler"
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Alt Ürünler"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -78,9 +76,14 @@ msgid "BoM"
 msgstr ""
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
-msgstr "Alt Ürünler"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "Alt_Ürünler"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -88,9 +91,13 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -98,5 +105,8 @@ msgstr ""
 msgid "Fixed"
 msgstr "Sabitlendi"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
+
 #~ msgid "Mrp Sub Product"
 #~ msgstr "MRP Alt Ürünü"
diff --git a/addons/mrp_subproduct/i18n/uk.po b/addons/mrp_subproduct/i18n/uk.po
index 5d35c715c32..a40607573ce 100644
--- a/addons/mrp_subproduct/i18n/uk.po
+++ b/addons/mrp_subproduct/i18n/uk.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-09-08 14:38+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури Вигляду!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,13 +46,8 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -78,8 +76,13 @@ msgid "BoM"
 msgstr ""
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -88,13 +91,24 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
-"Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильний XML для Архітектури Вигляду!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
diff --git a/addons/mrp_subproduct/i18n/vi.po b/addons/mrp_subproduct/i18n/vi.po
index 8a0f90554b7..0b69c0e2996 100644
--- a/addons/mrp_subproduct/i18n/vi.po
+++ b/addons/mrp_subproduct/i18n/vi.po
@@ -7,24 +7,27 @@ 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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-02 14:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -44,13 +47,8 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -79,8 +77,13 @@ msgid "BoM"
 msgstr ""
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -89,9 +92,13 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/zh_CN.po b/addons/mrp_subproduct/i18n/zh_CN.po
index d226676249e..273daf5d35a 100644
--- a/addons/mrp_subproduct/i18n/zh_CN.po
+++ b/addons/mrp_subproduct/i18n/zh_CN.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 09:02+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "产品"
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,13 +46,8 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "产品"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr "子产品"
 
 #. module: mrp_subproduct
@@ -78,8 +76,13 @@ msgid "BoM"
 msgstr "物料清单"
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr "子产品"
 
 #. module: mrp_subproduct
@@ -88,16 +91,27 @@ msgid "Variable"
 msgstr "可变的"
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr "固定的"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效XML视图结构!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+
 #~ msgid ""
 #~ "\n"
 #~ "This module allows you to produce several products from one production "
diff --git a/addons/mrp_subproduct/i18n/zh_TW.po b/addons/mrp_subproduct/i18n/zh_TW.po
index baab352e431..c48b27456c9 100644
--- a/addons/mrp_subproduct/i18n/zh_TW.po
+++ b/addons/mrp_subproduct/i18n/zh_TW.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-01-23 17:18+0000\n"
 "Last-Translator: <>\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-10-30 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -43,13 +46,8 @@ msgid ""
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -78,8 +76,13 @@ msgid "BoM"
 msgstr ""
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -88,9 +91,13 @@ msgid "Variable"
 msgstr ""
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
 msgstr ""
 
 #. module: mrp_subproduct
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/de.po b/addons/outlook/i18n/de.po
index 00e39f9efcf..ee0d686e57c 100644
--- a/addons/outlook/i18n/de.po
+++ b/addons/outlook/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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-12-01 08:17+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,60 +15,14 @@ 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:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: outlook
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Das Objekt muss mit einem x_ beginnen und darf keine Sonderzeichen "
-"beinhalten !"
-
-#. module: outlook
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: outlook
 #: field:outlook.installer,plugin_file:0
 msgid "Outlook Plug-in"
 msgstr "Outlook Plug-in"
 
-#. module: outlook
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#. module: outlook
-#: help:outlook.installer,doc_file:0
-msgid "The documentation file :- how to install Outlook Plug-in."
-msgstr "Die Dokumentationsdatei :- Wie wird das Outlook Plug-in installiert."
-
-#. 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 ""
-"Sie können ein Objekt auswählen und als Anhang zu Ihren EMails hinzufügen."
-
-#. module: outlook
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#. module: outlook
-#: view:outlook.installer:0
-msgid "_Close"
-msgstr "Beenden"
-
-#. module: outlook
-#: 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 !"
-
 #. module: outlook
 #: field:outlook.installer,doc_file:0
 msgid "Installation Manual"
@@ -79,6 +33,11 @@ msgstr "Installation Beschreibung"
 msgid "Configure"
 msgstr "Konfiguration"
 
+#. module: outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr "Beschreibung"
+
 #. module: outlook
 #: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
 msgid "Outlook Plug-In"
@@ -94,50 +53,6 @@ msgstr ""
 msgid "Outlook Interface"
 msgstr "Outlook Interface"
 
-#. 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 ""
-"Outlook plug-in Datei. Speichern Sie diese Datei und installieren Sie  diese "
-"dann als plug-in in Outlook."
-
-#. module: outlook
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Quellcode für diese Ansicht !"
-
-#. module: outlook
-#: model:ir.model,name:outlook.model_outlook_installer
-msgid "outlook.installer"
-msgstr ""
-
-#. module: outlook
-#: field:outlook.installer,doc_name:0
-#: field:outlook.installer,name:0
-msgid "File name"
-msgstr "Datei Name"
-
-#. module: outlook
-#: field:outlook.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Abfolge Konfiguration"
-
-#. module: outlook
-#: view:outlook.installer:0
-msgid "Installation and Configuration Steps"
-msgstr "Abfolge Installation und Konfiguration"
-
-#. module: outlook
-#: field:outlook.installer,description:0
-msgid "Description"
-msgstr "Beschreibung"
-
-#. module: outlook
-#: view:outlook.installer:0
-msgid "Skip"
-msgstr "Überspringen"
-
 #. module: outlook
 #: field:outlook.installer,config_logo:0
 msgid "Image"
@@ -148,6 +63,16 @@ msgstr "Bild"
 msgid "Outlook Plug-in "
 msgstr "Outlook Plug-in "
 
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr ""
+
+#. module: outlook
+#: help:outlook.installer,doc_file:0
+msgid "The documentation file :- how to install Outlook Plug-in."
+msgstr "Die Dokumentationsdatei :- Wie wird das Outlook Plug-in installiert."
+
 #. module: outlook
 #: model:ir.actions.act_window,name:outlook.action_outlook_installer
 #: model:ir.actions.act_window,name:outlook.action_outlook_wizard
@@ -155,6 +80,67 @@ msgid "Outlook Plug-In Configuration"
 msgstr "Outlook Plug-In Konfiguration"
 
 #. module: outlook
-#: 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 !"
+#: 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 ""
+"Sie können ein Objekt auswählen und als Anhang zu Ihren EMails hinzufügen."
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Skip"
+msgstr "Überspringen"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr "Beenden"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Abfolge Installation und Konfiguration"
+
+#. module: outlook
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
+msgstr "Datei Name"
+
+#. 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 ""
+"Outlook plug-in Datei. Speichern Sie diese Datei und installieren Sie  diese "
+"dann als plug-in in Outlook."
+
+#. module: outlook
+#: field:outlook.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Abfolge Konfiguration"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Das Objekt muss mit einem x_ beginnen und darf keine Sonderzeichen "
+#~ "beinhalten !"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Quellcode für diese Ansicht !"
+
+#~ 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 "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/outlook/i18n/es.po b/addons/outlook/i18n/es.po
index 92a8e3d1f80..ab693807c0a 100644
--- a/addons/outlook/i18n/es.po
+++ b/addons/outlook/i18n/es.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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-23 09:42+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -15,61 +15,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: outlook
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: outlook
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
 #. module: outlook
 #: field:outlook.installer,plugin_file:0
 msgid "Outlook Plug-in"
 msgstr "Conector Outlook"
 
-#. module: outlook
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
-#. module: outlook
-#: help:outlook.installer,doc_file:0
-msgid "The documentation file :- how to install Outlook Plug-in."
-msgstr "El fichero de documentación: Como instalar el conector Outlook."
-
-#. 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 ""
-"Le permite seleccionar un objeto al que quiera añadir su correo y sus "
-"adjuntos."
-
-#. module: outlook
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
-
-#. module: outlook
-#: view:outlook.installer:0
-msgid "_Close"
-msgstr "_Cerrar"
-
-#. module: outlook
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: outlook
 #: field:outlook.installer,doc_file:0
 msgid "Installation Manual"
@@ -80,6 +33,11 @@ msgstr "Manual instalación"
 msgid "Configure"
 msgstr "Configurar"
 
+#. module: outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr "Descripción"
+
 #. module: outlook
 #: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
 msgid "Outlook Plug-In"
@@ -95,50 +53,6 @@ msgstr "título"
 msgid "Outlook Interface"
 msgstr "Interfaz Outlook"
 
-#. 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 ""
-"Fichero del conector Outlook. Guarde este fichero e instale este conector en "
-"la aplicación Outlook."
-
-#. module: outlook
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la estructura de la vista!"
-
-#. module: outlook
-#: model:ir.model,name:outlook.model_outlook_installer
-msgid "outlook.installer"
-msgstr "outlook.instalador"
-
-#. module: outlook
-#: field:outlook.installer,doc_name:0
-#: field:outlook.installer,name:0
-msgid "File name"
-msgstr "Nombre fichero"
-
-#. module: outlook
-#: field:outlook.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso configuración"
-
-#. module: outlook
-#: view:outlook.installer:0
-msgid "Installation and Configuration Steps"
-msgstr "Pasos de instalación y configuración"
-
-#. module: outlook
-#: field:outlook.installer,description:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: outlook
-#: view:outlook.installer:0
-msgid "Skip"
-msgstr "Saltar"
-
 #. module: outlook
 #: field:outlook.installer,config_logo:0
 msgid "Image"
@@ -149,6 +63,16 @@ msgstr "Imagen"
 msgid "Outlook Plug-in "
 msgstr "Conector Outlook "
 
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr "outlook.instalador"
+
+#. module: outlook
+#: help:outlook.installer,doc_file:0
+msgid "The documentation file :- how to install Outlook Plug-in."
+msgstr "El fichero de documentación: Como instalar el conector Outlook."
+
 #. module: outlook
 #: model:ir.actions.act_window,name:outlook.action_outlook_installer
 #: model:ir.actions.act_window,name:outlook.action_outlook_wizard
@@ -156,6 +80,68 @@ msgid "Outlook Plug-In Configuration"
 msgstr "Configuración conector Outlook"
 
 #. module: outlook
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#: 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 ""
+"Le permite seleccionar un objeto al que quiera añadir su correo y sus "
+"adjuntos."
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Skip"
+msgstr "Saltar"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr "_Cerrar"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Pasos de instalación y configuración"
+
+#. module: outlook
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
+msgstr "Nombre fichero"
+
+#. 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 ""
+"Fichero del conector Outlook. Guarde este fichero e instale este conector en "
+"la aplicación Outlook."
+
+#. module: outlook
+#: field:outlook.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura de la vista!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/outlook/i18n/et.po b/addons/outlook/i18n/et.po
index e59b438decd..cc328a9acc0 100644
--- a/addons/outlook/i18n/et.po
+++ b/addons/outlook/i18n/et.po
@@ -7,64 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-30 14:45+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-12-01 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: outlook
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "Objekti nimi peab algama x_ ja ei tohi sisaldada erimärke!"
-
-#. module: outlook
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis"
-
 #. module: outlook
 #: field:outlook.installer,plugin_file:0
 msgid "Outlook Plug-in"
 msgstr ""
 
-#. module: outlook
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Mooduli nimi peab olema unikaalne !"
-
-#. module: outlook
-#: help:outlook.installer,doc_file:0
-msgid "The documentation file :- how to install Outlook Plug-in."
-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
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Viga! Te ei saa luua rekursiivset menüüd."
-
-#. module: outlook
-#: view:outlook.installer:0
-msgid "_Close"
-msgstr "_Sulge"
-
-#. module: outlook
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: outlook
 #: field:outlook.installer,doc_file:0
 msgid "Installation Manual"
@@ -75,6 +32,11 @@ msgstr "Instaleerimise manual"
 msgid "Configure"
 msgstr "Seadistused"
 
+#. module: outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr "Kirjeldus"
+
 #. module: outlook
 #: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
 msgid "Outlook Plug-In"
@@ -90,48 +52,6 @@ msgstr "pealkiri"
 msgid "Outlook Interface"
 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
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
-#. module: outlook
-#: model:ir.model,name:outlook.model_outlook_installer
-msgid "outlook.installer"
-msgstr ""
-
-#. module: outlook
-#: field:outlook.installer,doc_name:0
-#: field:outlook.installer,name:0
-msgid "File name"
-msgstr "Faili nimi"
-
-#. module: outlook
-#: field:outlook.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Seadistamise edenemine"
-
-#. module: outlook
-#: view:outlook.installer:0
-msgid "Installation and Configuration Steps"
-msgstr "Instaleerimise ja seadistamise sammud"
-
-#. module: outlook
-#: field:outlook.installer,description:0
-msgid "Description"
-msgstr "Kirjeldus"
-
-#. module: outlook
-#: view:outlook.installer:0
-msgid "Skip"
-msgstr "Jäta vahele"
-
 #. module: outlook
 #: field:outlook.installer,config_logo:0
 msgid "Image"
@@ -142,6 +62,16 @@ msgstr "Pilt"
 msgid "Outlook Plug-in "
 msgstr ""
 
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr ""
+
+#. 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
@@ -149,6 +79,59 @@ msgid "Outlook Plug-In Configuration"
 msgstr ""
 
 #. module: outlook
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Välja suurus ei saa olla kunagi väiksem kui 1"
+#: 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 "Jäta vahele"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr "_Sulge"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Instaleerimise ja seadistamise sammud"
+
+#. module: outlook
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
+msgstr "Faili nimi"
+
+#. 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 "Seadistamise edenemine"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "Objekti nimi peab algama x_ ja ei tohi sisaldada erimärke!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Vigane mudeli nimi toimingu definitsioonis"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Mooduli nimi peab olema unikaalne !"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Viga! Te ei saa luua rekursiivset menüüd."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Vigane XML vaate arhitektuurile!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Välja suurus ei saa olla kunagi väiksem kui 1"
diff --git a/addons/outlook/i18n/fr.po b/addons/outlook/i18n/fr.po
index c53ba9825ed..239b377bdb3 100644
--- a/addons/outlook/i18n/fr.po
+++ b/addons/outlook/i18n/fr.po
@@ -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-05 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: outlook
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/pt.po b/addons/outlook/i18n/pt.po
index 832027ad6c0..490577c0653 100644
--- a/addons/outlook/i18n/pt.po
+++ b/addons/outlook/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-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: outlook
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/sr@latin.po b/addons/outlook/i18n/sr@latin.po
index 6fd5790c2a2..6251caa5cc8 100644
--- a/addons/outlook/i18n/sr@latin.po
+++ b/addons/outlook/i18n/sr@latin.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-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: outlook
diff --git a/addons/outlook/i18n/sv.po b/addons/outlook/i18n/sv.po
index f2da0a8a77e..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-14 05:37+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/de.po b/addons/pad/i18n/de.po
index ee7cd7707cc..4d714b79217 100644
--- a/addons/pad/i18n/de.po
+++ b/addons/pad/i18n/de.po
@@ -7,26 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-10-27 12:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-16 09:08+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-17 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: pad
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID sollte eindeutig sein !"
-
-#. module: pad
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Quellcode für diese Ansicht !"
-
 #. module: pad
 #: code:addons/pad/web/editors.py:0
 #, python-format
@@ -39,37 +29,20 @@ msgstr "OK"
 msgid "Name"
 msgstr "Bezeichnung"
 
-#. module: pad
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#. module: pad
-#: help:res.company,pad_index:0
-msgid "The root URL of the company's pad instance"
-msgstr "Die root URL für die Pad Instanz"
-
 #. module: pad
 #: model:ir.model,name:pad.model_res_company
 msgid "Companies"
 msgstr "Unternehmen"
 
 #. module: pad
-#: model:ir.module.module,description:pad.module_meta_information
-msgid ""
-"\n"
-"Adds enhanced support for (Ether)Pad attachments in the web client, lets "
-"the\n"
-"company customize which Pad installation should be used to link to new pads\n"
-"(by default, pad.openerp.com)\n"
-"    "
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
-"\n"
-"Ermöglicht Arbeit mit Etherpad Dokumenten im Webclient. Durch die Angabe der "
-"URL zur Pad Instanz des Unternehmens (im Standard ist dieses \n"
-"pad.openerp.com)\n"
-"können dann Pad Dokumente in OpenERP verlinkt werden.\n"
-"    "
+
+#. module: pad
+#: help:res.company,pad_index:0
+msgid "The root URL of the company's pad instance"
+msgstr "Die root URL für die Pad Instanz"
 
 #. module: pad
 #: field:res.company,pad_index:0
@@ -88,15 +61,35 @@ msgstr "Pad"
 msgid "Enhanced support for (Ether)Pad attachments"
 msgstr "Unterstützung für (Ether) Pad Anhänge"
 
-#. module: pad
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
-"Sonderzeichen haben !"
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID sollte eindeutig sein !"
 
-#. module: pad
-#: 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 "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Quellcode für diese Ansicht !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid ""
+#~ "\n"
+#~ "Adds enhanced support for (Ether)Pad attachments in the web client, lets "
+#~ "the\n"
+#~ "company customize which Pad installation should be used to link to new pads\n"
+#~ "(by default, pad.openerp.com)\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Ermöglicht Arbeit mit Etherpad Dokumenten im Webclient. Durch die Angabe der "
+#~ "URL zur Pad Instanz des Unternehmens (im Standard ist dieses \n"
+#~ "pad.openerp.com)\n"
+#~ "können dann Pad Dokumente in OpenERP verlinkt werden.\n"
+#~ "    "
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
+#~ "Sonderzeichen haben !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/pad/i18n/es.po b/addons/pad/i18n/es.po
index d8c677973de..7a5c161c8ee 100644
--- a/addons/pad/i18n/es.po
+++ b/addons/pad/i18n/es.po
@@ -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-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: pad
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/pt.po b/addons/pad/i18n/pt.po
index 01235fee915..9f76a17a072 100644
--- a/addons/pad/i18n/pt.po
+++ b/addons/pad/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-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: pad
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/pad/i18n/sr@latin.po b/addons/pad/i18n/sr@latin.po
index 5711ffe70bd..054743955be 100644
--- a/addons/pad/i18n/sr@latin.po
+++ b/addons/pad/i18n/sr@latin.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-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: pad
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/ar.po b/addons/point_of_sale/i18n/ar.po
index e4bb3c9299a..33c075b879b 100644
--- a/addons/point_of_sale/i18n/ar.po
+++ b/addons/point_of_sale/i18n/ar.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-14 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1269,7 +1269,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/bg.po b/addons/point_of_sale/i18n/bg.po
index f90e415ecc9..0ecea297230 100644
--- a/addons/point_of_sale/i18n/bg.po
+++ b/addons/point_of_sale/i18n/bg.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-14 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1269,7 +1269,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/bs.po b/addons/point_of_sale/i18n/bs.po
index 6c197c9c641..425afa2158b 100644
--- a/addons/point_of_sale/i18n/bs.po
+++ b/addons/point_of_sale/i18n/bs.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-14 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1269,7 +1269,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/ca.po b/addons/point_of_sale/i18n/ca.po
index 77ce874b1fe..ca9c2e57be7 100644
--- a/addons/point_of_sale/i18n/ca.po
+++ b/addons/point_of_sale/i18n/ca.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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1269,7 +1269,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/cs.po b/addons/point_of_sale/i18n/cs.po
index 66f8c1b14b6..ea0305df939 100644
--- a/addons/point_of_sale/i18n/cs.po
+++ b/addons/point_of_sale/i18n/cs.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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1269,7 +1269,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/da.po b/addons/point_of_sale/i18n/da.po
index 56236b0e153..49406216c23 100644
--- a/addons/point_of_sale/i18n/da.po
+++ b/addons/point_of_sale/i18n/da.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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1270,7 +1270,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/de.po b/addons/point_of_sale/i18n/de.po
index 3beac04f7d3..54bf6d67ae8 100644
--- a/addons/point_of_sale/i18n/de.po
+++ b/addons/point_of_sale/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-14 04:10+0000\n"
+"PO-Revision-Date: 2010-12-14 21: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:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1271,7 +1271,7 @@ msgstr "Point Of Sale Zahlung"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr "Hauptkasse"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/el.po b/addons/point_of_sale/i18n/el.po
index d6623dc2493..4ec44350461 100644
--- a/addons/point_of_sale/i18n/el.po
+++ b/addons/point_of_sale/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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1271,7 +1271,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po
index 166f94fb44c..f86965c8da6 100644
--- a/addons/point_of_sale/i18n/es.po
+++ b/addons/point_of_sale/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-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-09 09:31+0000\n"
+"PO-Revision-Date: 2010-12-14 21:27+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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -2520,8 +2520,5 @@ msgstr ""
 #~ msgid "The name of the module must be unique !"
 #~ msgstr "¡El nombre del módulo debe ser único!"
 
-#~ msgid "Sortie de caisse"
-#~ msgstr "Salidas de caja"
-
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Debe asignar un lote de producción para este producto"
diff --git a/addons/point_of_sale/i18n/es_AR.po b/addons/point_of_sale/i18n/es_AR.po
index 1465a0a20fb..584401b7a5d 100644
--- a/addons/point_of_sale/i18n/es_AR.po
+++ b/addons/point_of_sale/i18n/es_AR.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-14 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1269,7 +1269,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/es_EC.po b/addons/point_of_sale/i18n/es_EC.po
index 4514ffb6ce8..d408cc50407 100644
--- a/addons/point_of_sale/i18n/es_EC.po
+++ b/addons/point_of_sale/i18n/es_EC.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-14 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1272,8 +1272,8 @@ msgstr "Pago de punto de venta"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
-msgstr ""
+msgid "Sortie de caisse"
+msgstr "Sortie de caisse"
 
 #. module: point_of_sale
 #: report:pos.details:0
diff --git a/addons/point_of_sale/i18n/et.po b/addons/point_of_sale/i18n/et.po
index e743a269985..d8deb291d18 100644
--- a/addons/point_of_sale/i18n/et.po
+++ b/addons/point_of_sale/i18n/et.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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1275,7 +1275,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/fi.po b/addons/point_of_sale/i18n/fi.po
index 955a22a21ac..8a63ad3295d 100644
--- a/addons/point_of_sale/i18n/fi.po
+++ b/addons/point_of_sale/i18n/fi.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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1270,7 +1270,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/fr.po b/addons/point_of_sale/i18n/fr.po
index c6488455119..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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1264,7 +1264,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/hi.po b/addons/point_of_sale/i18n/hi.po
index 9cbd0e827de..20658597680 100644
--- a/addons/point_of_sale/i18n/hi.po
+++ b/addons/point_of_sale/i18n/hi.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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1270,7 +1270,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/hr.po b/addons/point_of_sale/i18n/hr.po
index 1270d9b2831..fac151b56eb 100644
--- a/addons/point_of_sale/i18n/hr.po
+++ b/addons/point_of_sale/i18n/hr.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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1269,7 +1269,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/hu.po b/addons/point_of_sale/i18n/hu.po
index 459254bc518..4e6e1137f9c 100644
--- a/addons/point_of_sale/i18n/hu.po
+++ b/addons/point_of_sale/i18n/hu.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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1269,7 +1269,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/id.po b/addons/point_of_sale/i18n/id.po
index 9b17d9399d6..03da711261a 100644
--- a/addons/point_of_sale/i18n/id.po
+++ b/addons/point_of_sale/i18n/id.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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1269,7 +1269,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/it.po b/addons/point_of_sale/i18n/it.po
index e902c5aa522..201878d5aae 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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1269,7 +1269,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/ko.po b/addons/point_of_sale/i18n/ko.po
index 2918fba483c..0780d5d9a1b 100644
--- a/addons/point_of_sale/i18n/ko.po
+++ b/addons/point_of_sale/i18n/ko.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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1270,7 +1270,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/lt.po b/addons/point_of_sale/i18n/lt.po
index 7c1d5883911..3e572adc467 100644
--- a/addons/point_of_sale/i18n/lt.po
+++ b/addons/point_of_sale/i18n/lt.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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1269,7 +1269,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/mn.po b/addons/point_of_sale/i18n/mn.po
index 8013325de48..533f108bf6f 100644
--- a/addons/point_of_sale/i18n/mn.po
+++ b/addons/point_of_sale/i18n/mn.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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1270,7 +1270,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/nl.po b/addons/point_of_sale/i18n/nl.po
index b1b7045fa19..55c519f44be 100644
--- a/addons/point_of_sale/i18n/nl.po
+++ b/addons/point_of_sale/i18n/nl.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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1269,7 +1269,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/nl_BE.po b/addons/point_of_sale/i18n/nl_BE.po
index bd3fe831267..a2577d1cbd5 100644
--- a/addons/point_of_sale/i18n/nl_BE.po
+++ b/addons/point_of_sale/i18n/nl_BE.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-14 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1268,7 +1268,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/pl.po b/addons/point_of_sale/i18n/pl.po
index 73957de172a..a7f2a159c7d 100644
--- a/addons/point_of_sale/i18n/pl.po
+++ b/addons/point_of_sale/i18n/pl.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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1269,7 +1269,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. 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 ce02b324fb0..f490d80e071 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 c3e1b90170c..4fb355e8206 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-12 13:15+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1269,8 +1269,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
-msgstr ""
+msgid "Sortie de caisse"
+msgstr "Saída de caixa"
 
 #. module: point_of_sale
 #: report:pos.details:0
diff --git a/addons/point_of_sale/i18n/pt_BR.po b/addons/point_of_sale/i18n/pt_BR.po
index b648ea23cef..6729188001f 100644
--- a/addons/point_of_sale/i18n/pt_BR.po
+++ b/addons/point_of_sale/i18n/pt_BR.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-14 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1269,7 +1269,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/ro.po b/addons/point_of_sale/i18n/ro.po
index 29773cdfcdc..c4d481184ae 100644
--- a/addons/point_of_sale/i18n/ro.po
+++ b/addons/point_of_sale/i18n/ro.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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1269,7 +1269,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/ru.po b/addons/point_of_sale/i18n/ru.po
index 15b59c9ce08..e33cb3fe9e4 100644
--- a/addons/point_of_sale/i18n/ru.po
+++ b/addons/point_of_sale/i18n/ru.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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1269,7 +1269,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/sl.po b/addons/point_of_sale/i18n/sl.po
index 1332e43e828..6d3df0cbc3e 100644
--- a/addons/point_of_sale/i18n/sl.po
+++ b/addons/point_of_sale/i18n/sl.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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1269,7 +1269,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/sq.po b/addons/point_of_sale/i18n/sq.po
index 3e677394064..6a9a08a93ab 100644
--- a/addons/point_of_sale/i18n/sq.po
+++ b/addons/point_of_sale/i18n/sq.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-14 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1270,7 +1270,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/sr.po b/addons/point_of_sale/i18n/sr.po
index 6ce3b1af543..3cfc82dc0b7 100644
--- a/addons/point_of_sale/i18n/sr.po
+++ b/addons/point_of_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-03 15:44+0000\n"
-"PO-Revision-Date: 2010-10-29 09:39+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-14 21:38+0000\n"
+"Last-Translator: Christophe (OpenERP) <Unknown>\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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1270,8 +1270,8 @@ msgstr "POS Placanja"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
-msgstr ""
+msgid "Sortie de caisse"
+msgstr "Gotovina Van"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -2522,9 +2522,6 @@ msgstr "Godina"
 #~ "Osoba koja koristi registre. To mogu biti volonteri, studenti ili privremeni "
 #~ "radnici."
 
-#~ msgid "Sortie de caisse"
-#~ msgstr "Gotovina Van"
-
 #~ msgid "Register management"
 #~ msgstr "Menadzment Registara"
 
diff --git a/addons/point_of_sale/i18n/sr@latin.po b/addons/point_of_sale/i18n/sr@latin.po
index 392c0fab76f..6ac073a369b 100644
--- a/addons/point_of_sale/i18n/sr@latin.po
+++ b/addons/point_of_sale/i18n/sr@latin.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-14 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1265,7 +1265,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/sv.po b/addons/point_of_sale/i18n/sv.po
index f2713e1cdd1..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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1264,7 +1264,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/tlh.po b/addons/point_of_sale/i18n/tlh.po
index e433170b329..a7f43a21b5b 100644
--- a/addons/point_of_sale/i18n/tlh.po
+++ b/addons/point_of_sale/i18n/tlh.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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1269,7 +1269,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/tr.po b/addons/point_of_sale/i18n/tr.po
index be108166f05..5f6df025d76 100644
--- a/addons/point_of_sale/i18n/tr.po
+++ b/addons/point_of_sale/i18n/tr.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-14 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1270,7 +1270,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/uk.po b/addons/point_of_sale/i18n/uk.po
index 6163101e9f5..9aad04adf4b 100644
--- a/addons/point_of_sale/i18n/uk.po
+++ b/addons/point_of_sale/i18n/uk.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-14 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1270,7 +1270,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/vi.po b/addons/point_of_sale/i18n/vi.po
index ecacbd0095b..76109ed2d4c 100644
--- a/addons/point_of_sale/i18n/vi.po
+++ b/addons/point_of_sale/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-14 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1271,7 +1271,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po
index 3cd004958f2..7df67d5129e 100644
--- a/addons/point_of_sale/i18n/zh_CN.po
+++ b/addons/point_of_sale/i18n/zh_CN.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-14 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1270,7 +1270,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/zh_HK.po b/addons/point_of_sale/i18n/zh_HK.po
index 0955b41dc8d..881b70c86a2 100644
--- a/addons/point_of_sale/i18n/zh_HK.po
+++ b/addons/point_of_sale/i18n/zh_HK.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-14 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1271,7 +1271,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/zh_TW.po b/addons/point_of_sale/i18n/zh_TW.po
index 74b4c7b2363..3baea9c8b55 100644
--- a/addons/point_of_sale/i18n/zh_TW.po
+++ b/addons/point_of_sale/i18n/zh_TW.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-14 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1270,7 +1270,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.box.out:0
-msgid "Output Operation"
+msgid "Sortie de caisse"
 msgstr ""
 
 #. 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/de.po b/addons/procurement/i18n/de.po
index 0efb266921a..7edd6dac616 100644
--- a/addons/procurement/i18n/de.po
+++ b/addons/procurement/i18n/de.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
diff --git a/addons/procurement/i18n/es.po b/addons/procurement/i18n/es.po
index dcf09774241..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-14 05:36+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/fr.po b/addons/procurement/i18n/fr.po
index d166a1408ae..ee5232ed93c 100644
--- a/addons/procurement/i18n/fr.po
+++ b/addons/procurement/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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
diff --git a/addons/procurement/i18n/it.po b/addons/procurement/i18n/it.po
index 970d203aeb2..9cd5114df5b 100644
--- a/addons/procurement/i18n/it.po
+++ b/addons/procurement/i18n/it.po
@@ -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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
diff --git a/addons/procurement/i18n/mn.po b/addons/procurement/i18n/mn.po
index 88a05bbfe79..6db66fb1d0d 100644
--- a/addons/procurement/i18n/mn.po
+++ b/addons/procurement/i18n/mn.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
diff --git a/addons/procurement/i18n/nl.po b/addons/procurement/i18n/nl.po
index 7fc05547f68..0afa77b02d7 100644
--- a/addons/procurement/i18n/nl.po
+++ b/addons/procurement/i18n/nl.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
diff --git a/addons/procurement/i18n/pl.po b/addons/procurement/i18n/pl.po
index 2e11ca69af6..c302d54f353 100644
--- a/addons/procurement/i18n/pl.po
+++ b/addons/procurement/i18n/pl.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
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/pt.po b/addons/procurement/i18n/pt.po
index 782f61a283f..5dfd2aa9f5a 100644
--- a/addons/procurement/i18n/pt.po
+++ b/addons/procurement/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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po
index ef8655b93c8..9444943131b 100644
--- a/addons/procurement/i18n/ru.po
+++ b/addons/procurement/i18n/ru.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
diff --git a/addons/procurement/i18n/sr.po b/addons/procurement/i18n/sr.po
index a238adec64f..c53057d9a40 100644
--- a/addons/procurement/i18n/sr.po
+++ b/addons/procurement/i18n/sr.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
diff --git a/addons/procurement/i18n/sr@latin.po b/addons/procurement/i18n/sr@latin.po
index 181d4da9ee5..cc04d78d461 100644
--- a/addons/procurement/i18n/sr@latin.po
+++ b/addons/procurement/i18n/sr@latin.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
diff --git a/addons/procurement/i18n/sv.po b/addons/procurement/i18n/sv.po
index e6b066e3336..314bab7a98c 100644
--- a/addons/procurement/i18n/sv.po
+++ b/addons/procurement/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-12 22:37+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 05:17+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:36+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
new file mode 100644
index 00000000000..674e3d072da
--- /dev/null
+++ b/addons/procurement/i18n/zh_CN.po
@@ -0,0 +1,869 @@
+# Chinese (Simplified) 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: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-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_sched
+msgid "Schedulers"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_make_procurement
+msgid "Make Procurements"
+msgstr "进行采购"
+
+#. module: procurement
+#: help:procurement.order.compute.all,automatic:0
+msgid ""
+"Triggers an automatic procurement for all products that have a virtual stock "
+"under 0. You should probably not use this option, we suggest using a MTO "
+"configuration on products."
+msgstr "触发所有虚拟库存为小于0的自动采购。建议您不要使用这个选项，而使用产品按单生产(MTO)的设置。"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Group By..."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Planification"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr "尚未定义这个产品的供应商！"
+
+#. module: procurement
+#: field:make.procurement,uom_id:0
+msgid "Unit of Measure"
+msgstr "计量单位"
+
+#. module: procurement
+#: field:procurement.order,procure_method:0
+msgid "Procurement Method"
+msgstr "采购方式"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "No address defined for the supplier"
+msgstr "供应商地址未定义"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_procurement_compute
+msgid "Compute Stock Minimum Rules Only"
+msgstr "仅计算最少库存规则"
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_action
+msgid ""
+"A procurement order is used to record a need in a specific product at a "
+"specific location. They are usually created automatically by the sales "
+"orders, the Pull Logistics rules or the minimum stock rules. When the "
+"procurement order is confirmed, it creates automatically the necessary "
+"operations to fullfil the need: purchase order proposition, manufacturing "
+"order, etc."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,company_id:0
+#: field:stock.warehouse.orderpoint,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: procurement
+#: field:procurement.order,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr "销售单位数量"
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,name:0
+msgid "Reason"
+msgstr "理由"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "Compute Procurements"
+msgstr "计算产品需求"
+
+#. module: procurement
+#: field:procurement.order,message:0
+msgid "Latest error"
+msgstr "最近的错误"
+
+#. module: procurement
+#: help:mrp.property,composition:0
+msgid "Not used in computations, for information purpose only."
+msgstr "没有在计算中使用，只为了提供信息。"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Latest procurement"
+msgstr "上次采购"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Notes"
+msgstr "备注"
+
+#. module: procurement
+#: help:procurement.order,message:0
+msgid "Exception occurred while computing procurement orders."
+msgstr "采购订单计算中出错。"
+
+#. module: procurement
+#: help:procurement.order,state:0
+msgid ""
+"When a procurement is created the state is set to 'Draft'.\n"
+" If the procurement is confirmed, the state is set to 'Confirmed'.           "
+" \n"
+"After confirming the state is set to 'Running'.\n"
+" If any exception arises in the order then the state is set to 'Exception'.\n"
+" Once the exception is removed the state becomes 'Ready'.\n"
+" It is in 'Waiting'. state when the procurement is waiting for another one "
+"to finish."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules Search"
+msgstr "使用最少库存法则搜寻"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_min_qty:0
+msgid ""
+"When the virtual stock goes belong the Min Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid "Scheduler Parameters"
+msgstr "计划工具参数"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_move
+msgid "Stock Move"
+msgstr "库存调拨"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Ready"
+msgstr "准备就绪"
+
+#. module: procurement
+#: field:procurement.order.compute.all,automatic:0
+msgid "Automatic orderpoint"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr "属性组成"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Confirmed"
+msgstr "已确认"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Retry"
+msgstr "重试"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+#: view:procurement.orderpoint.compute:0
+msgid "Parameters"
+msgstr "参数"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Confirm"
+msgstr "确认"
+
+#. module: procurement
+#: help:procurement.order,origin:0
+msgid ""
+"Reference of the document that created this Procurement.\n"
+"This is automatically completed by OpenERP."
+msgstr ""
+
+#. module: procurement
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,priority:0
+msgid "Priority"
+msgstr "优先级"
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,state:0
+msgid "State"
+msgstr "州"
+
+#. module: procurement
+#: field:procurement.order,location_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,location_id:0
+msgid "Location"
+msgstr "位置"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_picking
+msgid "Picking List"
+msgstr "领料/提货单"
+
+#. module: procurement
+#: field:make.procurement,warehouse_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,warehouse_id:0
+msgid "Warehouse"
+msgstr "仓库"
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
+msgid ""
+"You can define your minimum stock rules, so that OpenERP will trigger "
+"automatically the propositions of manufacturing or purchase orders according "
+"to the stock level. Once the virtual stock of a product (=stock on hand "
+"minus all confirmed orders and reservations) is bellow the minimum quantity, "
+"OpenERP will generate a procurement request in order to fullfil the stock up "
+"to the maximum quantity."
+msgstr ""
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Best price (not yet active!)"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Product & Location"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute
+msgid "Compute Procurement"
+msgstr ""
+
+#. module: procurement
+#: model:ir.module.module,shortdesc:procurement.module_meta_information
+#: field:stock.move,procurements:0
+msgid "Procurements"
+msgstr ""
+
+#. module: procurement
+#: field:res.company,schedule_range:0
+msgid "Scheduler Range Days"
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,date_planned:0
+msgid "Planned Date"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Group By"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,qty:0
+#: field:procurement.order,product_qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "Not enough stock and no minimum orderpoint rule defined."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "References"
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,procure_method:0
+msgid ""
+"If you encode manually a Procurement, you probably want to use a make to "
+"order method."
+msgstr ""
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement
+msgid "Automatic Procurements"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_max_qty:0
+msgid "Max Quantity"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order
+#: model:process.process,name:procurement.process_process_procurementprocess0
+#: view:procurement.order:0
+msgid "Procurement"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action
+msgid "Procurement Orders"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "To Fix"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_serviceonorder0
+msgid "Assignment from Production or Purchase Order."
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property
+msgid "Property"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_make_procurement
+#: view:make.procurement:0
+msgid "Procurement Request"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Compute Stock"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Late"
+msgstr ""
+
+#. module: procurement
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_min_qty:0
+msgid "Min Quantity"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "plus"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid ""
+"Please check the Quantity in Procurement Order(s), it should not be less "
+"than 1!"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"orderpoint without removing it."
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_max_qty:0
+msgid ""
+"When the virtual stock goes belong the Max Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+
+#. module: procurement
+#: help:procurement.orderpoint.compute,automatic:0
+msgid "If the stock of a product is under 0, it will act like an orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Lines"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid ""
+"This wizard allows you to run all procurement, production and/or purchase "
+"orders that should be processed based on their configuration. By default, "
+"the scheduler is launched automatically every night by OpenERP. You can use "
+"this menu to force it to be launched now. Note that it runs in the "
+"background, you may have to wait for a few minutes until it has finished "
+"computing."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,note:0
+msgid "Note"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "This wizard will schedule procurements."
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_exceptions
+msgid ""
+"Procurement Orders represent the need for a certain quantity of products, at "
+"a given time, in a given location. Sale Orders are one typical source of "
+"Procurement Orders (but these are distinct documents). Depending on the "
+"procurement parameters and the products configuration, the procurement "
+"engine will attempt to satisfy the need by reserving products from stock, or "
+"ordering products from a supplier, or passing a manufacturing order, etc. A "
+"Procurement Exception occurs when the system cannot find a way to fulfill a "
+"procurement. Some exceptions will resolve themselves automatically, but "
+"others require manual intervention (those are identified by a specific error "
+"message)"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Status"
+msgstr ""
+
+#. module: procurement
+#: help:res.company,schedule_range:0
+msgid ""
+"This is the time frame analysed by the scheduler when computing "
+"procurements. All procurements that are not between today and today+range "
+"are skipped for futur computation."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_procureproducts0
+msgid "Procure Products"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_planned:0
+msgid "Scheduled date"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:0
+#, python-format
+msgid "Automatic OP: %s"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
+msgid "Automatic Order Point"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,name:0
+msgid "Procurement name."
+msgstr ""
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Reason"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#: sql_constraint:stock.warehouse.orderpoint:0
+#, python-format
+msgid "Qty Multiple must be greater than zero."
+msgstr ""
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "Procurement '%s' is in exception: not enough stock."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "Data Insufficient !"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property_group
+#: field:mrp.property,group_id:0
+#: field:mrp.property.group,name:0
+msgid "Property Group"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Misc"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Locations"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "from stock"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "General Information"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Run Procurement"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will by rounded up to this multiple."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+#: view:procurement.order:0
+#: selection:procurement.order,state:0
+#: view:procurement.order.compute:0
+#: view:procurement.order.compute.all:0
+#: view:procurement.orderpoint.compute:0
+msgid "Cancel"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,logic:0
+msgid "Reordering Mode"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Current"
+msgstr ""
+
+#. module: procurement
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Details"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+msgid "Procurement Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_product_product_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_stock_warehouse_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.action_orderpoint_form
+#: model:ir.ui.menu,name:procurement.menu_stock_order_points
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,close_move:0
+msgid "Close Move at end"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,product_id:0
+#: view:procurement.order:0
+#: field:procurement.order,product_id:0
+#: field:stock.warehouse.orderpoint,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+msgid "Description"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "min"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Quantity Rules"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Running"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_serviceonorder0
+msgid "Make to Order"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "UOM"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "on order"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,move_id:0
+msgid "Reservation"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+msgid ""
+"This wizard will plan the procurement for this product. This procurement may "
+"generate task, production orders or purchase orders."
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "MRP & Logistics Scheduler"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,name:0
+#: field:stock.warehouse.orderpoint,name:0
+msgid "Name"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "from stock: products assigned."
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_compute_schedulers
+#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
+#: view:procurement.order.compute.all:0
+msgid "Compute Schedulers"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid ""
+"Wizard checks all the stock minimum rules and generate procurement order."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Search Procurement"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.orderpoint.compute,automatic:0
+msgid "Automatic Orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Details"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:0
+#, python-format
+msgid "SCHEDULER"
+msgstr ""
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/procurement_view.xml b/addons/procurement/procurement_view.xml
index 96b96f3af21..2cc3b4c199f 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -265,7 +265,7 @@
         <menuitem id="menu_stock_sched" name="Schedulers" parent="stock.menu_stock_root" sequence="4"/>
             <menuitem action="action_compute_schedulers" id="menu_stock_proc_schedulers" parent="menu_stock_sched" sequence="20" groups="stock.group_stock_manager"/>
             <menuitem action="procurement_exceptions" id="menu_stock_procurement_action" parent="menu_stock_sched" sequence="50" groups="stock.group_stock_manager"/>
-        <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5" groups="base.group_extended"/>
+        <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_configuration" sequence="5" groups="base.group_extended"/>
             <menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="menu_stock_procurement" sequence="10"/>
 
     </data>
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/security/ir.model.access.csv b/addons/procurement/security/ir.model.access.csv
index 382543c9df4..a09115daecf 100644
--- a/addons/procurement/security/ir.model.access.csv
+++ b/addons/procurement/security/ir.model.access.csv
@@ -2,7 +2,7 @@
 "access_procurement","procurement.order","model_procurement_order","base.group_user",1,0,0,0
 "access_procurement_stock_manager","procurement.order stock.manager","model_procurement_order","stock.group_stock_manager",1,1,1,1
 "access_procurement_stock_user","procurement.order stock.user","model_procurement_order","stock.group_stock_user",1,1,1,1
-"access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint","stock.group_stock_user",1,1,1,1
+"access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint","stock.group_stock_user",1,0,0,0
 "access_stock_warehouse_orderpoint_system","stock.warehouse.orderpoint system","model_stock_warehouse_orderpoint","stock.group_stock_manager",1,1,1,1
 "access_mrp_property_group","mrp.property.group","model_mrp_property_group","stock.group_stock_manager",1,1,1,1
 "access_mrp_property","mrp.property","model_mrp_property","stock.group_stock_manager",1,1,1,1
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 a189b1a45b7..a279efc7e38 100644
--- a/addons/product/i18n/sv.po
+++ b/addons/product/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-13 20:15+0000\n"
-"Last-Translator: Anders Eriksson, Aspirix AB <ae@mobilasystem.se>\n"
+"PO-Revision-Date: 2010-12-14 23:56+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/vi.po b/addons/product/i18n/vi.po
index d2aebf99409..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-11-26 22:21+0000\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-14 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -579,7 +579,7 @@ msgstr ""
 #: constraint:product.packaging:0
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Lỗi: mã EAN không hợp lệ"
 
 #. module: product
 #: field:product.pricelist.item,min_quantity:0
@@ -887,7 +887,7 @@ msgstr "Thông tin về nhà cung cấp sản phẩm"
 #. module: product
 #: view:product.product:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Bộ lọc mở rộng..."
 
 #. module: product
 #: view:product.product:0
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/ca.po b/addons/product_expiry/i18n/ca.po
index ca5db71037c..68ae5421b96 100644
--- a/addons/product_expiry/i18n/ca.po
+++ b/addons/product_expiry/i18n/ca.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-02 17:58+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: Catalan <ca@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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
@@ -22,12 +22,6 @@ msgstr ""
 msgid "Production lot"
 msgstr ""
 
-#. module: product_expiry
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
 msgid "Ham"
@@ -43,27 +37,31 @@ msgstr "Llet de vaca"
 msgid "Products date of expiry"
 msgstr "Data de caducitat de productes"
 
-#. module: product_expiry
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Error: La UdM per defecte i la UdM de compra han d'estar en la mateixa "
-"categoria."
-
 #. module: product_expiry
 #: field:product.product,life_time:0
 msgid "Product Life Time"
 msgstr ""
 
+#. module: product_expiry
+#: help:stock.production.lot,use_date:0
+msgid ""
+"The date on which the lot starts deteriorating without becoming dangerous."
+msgstr ""
+
 #. module: product_expiry
 #: field:product.product,use_time:0
 msgid "Product Use Time"
 msgstr ""
 
 #. module: product_expiry
-#: help:stock.production.lot,alert_date:0
-msgid "The date signifying an alert to notify about the production lot."
+#: sql_constraint:stock.production.lot:0
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr ""
+
+#. module: product_expiry
+#: help:stock.production.lot,removal_date:0
+msgid "The date on which the lot should be removed."
 msgstr ""
 
 #. module: product_expiry
@@ -72,8 +70,10 @@ msgid "Product"
 msgstr ""
 
 #. module: product_expiry
-#: help:stock.production.lot,life_date:0
-msgid "The date the lot may become dangerous and should not be consumed."
+#: help:product.product,alert_time:0
+msgid ""
+"The number of days after which an alert should be notified about the "
+"production lot."
 msgstr ""
 
 #. module: product_expiry
@@ -86,6 +86,12 @@ msgstr ""
 msgid "Removal Date"
 msgstr ""
 
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid ""
+"The date on which the lot may become dangerous and should not be consumed."
+msgstr ""
+
 #. module: product_expiry
 #: model:ir.module.module,description:product_expiry.module_meta_information
 msgid ""
@@ -114,18 +120,6 @@ msgstr "LTR"
 msgid "Dates"
 msgstr "Dates"
 
-#. module: product_expiry
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr "Error: La UdV ha d'estar en una categoria diferent que la UdM."
-
-#. module: product_expiry
-#: help:product.product,alert_time:0
-msgid ""
-"The number of days after which, needs an alert to notify about the "
-"production lot."
-msgstr ""
-
 #. module: product_expiry
 #: field:stock.production.lot,life_date:0
 msgid "End of Life Date"
@@ -136,11 +130,6 @@ msgstr ""
 msgid "Best before Date"
 msgstr ""
 
-#. module: product_expiry
-#: help:stock.production.lot,use_date:0
-msgid "The date the lot starts deteriorating without becoming dangerous."
-msgstr ""
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_jambon_product_template
 msgid "French cheese Camenbert"
@@ -151,11 +140,6 @@ msgstr "Formatge Camembert francès"
 msgid "The number of days before a production lot should be removed."
 msgstr ""
 
-#. module: product_expiry
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML no vàlid per a la definició de la vista!"
-
 #. module: product_expiry
 #: help:product.product,use_time:0
 msgid ""
@@ -176,8 +160,9 @@ msgid ""
 msgstr ""
 
 #. module: product_expiry
-#: help:stock.production.lot,removal_date:0
-msgid "The date the lot should be removed."
+#: help:stock.production.lot,alert_date:0
+msgid ""
+"The date on which an alert should be notified about the production lot."
 msgstr ""
 
 #. module: product_expiry
@@ -185,14 +170,26 @@ msgstr ""
 msgid "Product Alert Time"
 msgstr ""
 
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr "Error: La UdV ha d'estar en una categoria diferent que la UdM."
+
 #~ msgid "Product alert time"
 #~ msgstr "Data alerta producte"
 
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Error: La UdM per defecte i la UdM de compra han d'estar en la mateixa "
+#~ "categoria."
+
 #~ msgid "Product removal time"
 #~ msgstr "Data eliminació producte"
 
 #~ msgid "Product usetime"
 #~ msgstr "Temps d'ús producte"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML no vàlid per a la definició de la vista!"
+
 #~ msgid "Product lifetime"
 #~ msgstr "Cicle de vida producte"
diff --git a/addons/product_expiry/i18n/de.po b/addons/product_expiry/i18n/de.po
index d0db275515f..5325c2a3546 100644
--- a/addons/product_expiry/i18n/de.po
+++ b/addons/product_expiry/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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-12-01 09:34+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-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
@@ -23,14 +23,6 @@ msgstr ""
 msgid "Production lot"
 msgstr "Fertigungslos"
 
-#. module: product_expiry
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
-"Sonderzeichen haben !"
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
 msgid "Ham"
@@ -46,23 +38,16 @@ msgstr "Kuhmilch"
 msgid "Products date of expiry"
 msgstr "Produkte Verwendungsdauer und Ablaufwarnung"
 
-#. module: product_expiry
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Fehler: Die Standard Mengeneinheit (ME) sowie die Mengeneinheit (ME) bei der "
-"Beschaffung muss in derselben Kategorie sein."
-
 #. module: product_expiry
 #: field:product.product,life_time:0
 msgid "Product Life Time"
 msgstr "Verfalldauer"
 
 #. module: product_expiry
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+#: help:stock.production.lot,use_date:0
+msgid ""
+"The date on which the lot starts deteriorating without becoming dangerous."
+msgstr ""
 
 #. module: product_expiry
 #: field:product.product,use_time:0
@@ -70,16 +55,15 @@ msgid "Product Use Time"
 msgstr "Mindesthaltbarkeit"
 
 #. module: product_expiry
-#: 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 !"
+#: sql_constraint:stock.production.lot:0
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr ""
 
 #. module: product_expiry
-#: help:stock.production.lot,alert_date:0
-msgid "The date signifying an alert to notify about the production lot."
+#: help:stock.production.lot,removal_date:0
+msgid "The date on which the lot should be removed."
 msgstr ""
-"Das Datum, an dem ein Warnhinweis über den Verfall oder Ablauf von Produkten "
-"generiert wird."
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_product_product
@@ -87,12 +71,11 @@ msgid "Product"
 msgstr "Produkt"
 
 #. module: product_expiry
-#: help:stock.production.lot,life_date:0
-msgid "The date the lot may become dangerous and should not be consumed."
+#: help:product.product,alert_time:0
+msgid ""
+"The number of days after which an alert should be notified about the "
+"production lot."
 msgstr ""
-"Das Datum an dem die Verwendung des Los gefährlich werden kann und deshalb "
-"nicht mehr konsumiert bzw. angewendet werden sollte (z.B. Verwendbar bis bei "
-"Arzneimitteln)."
 
 #. module: product_expiry
 #: field:product.product,removal_time:0
@@ -104,6 +87,12 @@ msgstr "Dauer bis Vernichtung"
 msgid "Removal Date"
 msgstr "Datum der Vernichtung"
 
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid ""
+"The date on which the lot may become dangerous and should not be consumed."
+msgstr ""
+
 #. module: product_expiry
 #: model:ir.module.module,description:product_expiry.module_meta_information
 msgid ""
@@ -139,27 +128,6 @@ msgstr "Produkthaltbarkeit"
 msgid "Dates"
 msgstr "Haltbarkeitsdauern"
 
-#. module: product_expiry
-#: sql_constraint:product.uom:0
-msgid "The conversion ratio for a unit of measure cannot be 0!"
-msgstr "Der Umrechnungsfaktor einer Mengeneinheit kann nicht 0 sein!"
-
-#. module: product_expiry
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-"Fehler: Die Verkaufseinheit sollte in einer anderen Kategorie sein als die "
-"Mengeneinheit"
-
-#. module: product_expiry
-#: help:product.product,alert_time:0
-msgid ""
-"The number of days after which, needs an alert to notify about the "
-"production lot."
-msgstr ""
-"Die Anzahl an Tagen nach denen ein Warnhinweis bezüglich dieses Los erstellt "
-"wird."
-
 #. module: product_expiry
 #: field:stock.production.lot,life_date:0
 msgid "End of Life Date"
@@ -170,15 +138,6 @@ msgstr "verwendbar bis"
 msgid "Best before Date"
 msgstr "mindestens Haltbar bis"
 
-#. module: product_expiry
-#: help:stock.production.lot,use_date:0
-msgid "The date the lot starts deteriorating without becoming dangerous."
-msgstr ""
-"Das Datum, ab dem das Produkt schlechter wird ohne gefährlich zu werden (... "
-"mindestens Haltbar bis). Dieser Hinweis findet sich z.B. bei Lebensmitteln, "
-"die zwar ohneGefahr verzehrt werden können, aber z.B. "
-"geschmacklichbeeinträchtigt sind."
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_jambon_product_template
 msgid "French cheese Camenbert"
@@ -189,11 +148,6 @@ msgstr "französicher Camembert"
 msgid "The number of days before a production lot should be removed."
 msgstr "Tage bis ein Los vernichtet oder anderweitig verwertet werden soll"
 
-#. module: product_expiry
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter XML-Code für diese Ansicht!"
-
 #. module: product_expiry
 #: help:product.product,use_time:0
 msgid ""
@@ -218,24 +172,22 @@ msgstr ""
 "verwendet werden sollte (Verwendbar bis ...)"
 
 #. module: product_expiry
-#: help:stock.production.lot,removal_date:0
-msgid "The date the lot should be removed."
+#: help:stock.production.lot,alert_date:0
+msgid ""
+"The date on which an alert should be notified about the production lot."
 msgstr ""
-"Datum an dem das Los vernichtet oder anderweitig verwertet werden soll"
 
 #. module: product_expiry
 #: field:product.product,alert_time:0
 msgid "Product Alert Time"
 msgstr "Datum Ablaufwarnung"
 
-#. module: product_expiry
-#: 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 "Product lifetime"
 #~ msgstr "Produktlebensdauer"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter XML-Code für diese Ansicht!"
+
 #~ msgid "Product usetime"
 #~ msgstr "Produkt Verwendungsdauer"
 
@@ -247,3 +199,61 @@ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
 
 #~ msgid "Product alert time"
 #~ msgstr "Produkt Alarmzeitpunkt"
+
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr ""
+#~ "Fehler: Die Verkaufseinheit sollte in einer anderen Kategorie sein als die "
+#~ "Mengeneinheit"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
+#~ "Sonderzeichen haben !"
+
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Fehler: Die Standard Mengeneinheit (ME) sowie die Mengeneinheit (ME) bei der "
+#~ "Beschaffung muss in derselben Kategorie sein."
+
+#~ msgid "The date signifying an alert to notify about the production lot."
+#~ msgstr ""
+#~ "Das Datum, an dem ein Warnhinweis über den Verfall oder Ablauf von Produkten "
+#~ "generiert wird."
+
+#~ msgid "The date the lot may become dangerous and should not be consumed."
+#~ msgstr ""
+#~ "Das Datum an dem die Verwendung des Los gefährlich werden kann und deshalb "
+#~ "nicht mehr konsumiert bzw. angewendet werden sollte (z.B. Verwendbar bis bei "
+#~ "Arzneimitteln)."
+
+#~ msgid ""
+#~ "The number of days after which, needs an alert to notify about the "
+#~ "production lot."
+#~ msgstr ""
+#~ "Die Anzahl an Tagen nach denen ein Warnhinweis bezüglich dieses Los erstellt "
+#~ "wird."
+
+#~ msgid "The date the lot starts deteriorating without becoming dangerous."
+#~ msgstr ""
+#~ "Das Datum, ab dem das Produkt schlechter wird ohne gefährlich zu werden (... "
+#~ "mindestens Haltbar bis). Dieser Hinweis findet sich z.B. bei Lebensmitteln, "
+#~ "die zwar ohneGefahr verzehrt werden können, aber z.B. "
+#~ "geschmacklichbeeinträchtigt sind."
+
+#~ msgid "The date the lot should be removed."
+#~ msgstr ""
+#~ "Datum an dem das Los vernichtet oder anderweitig verwertet werden soll"
+
+#~ msgid "The conversion ratio for a unit of measure cannot be 0!"
+#~ msgstr "Der Umrechnungsfaktor einer Mengeneinheit kann nicht 0 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 "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/product_expiry/i18n/el.po b/addons/product_expiry/i18n/el.po
index b961e325b48..6d3a60fde3a 100644
--- a/addons/product_expiry/i18n/el.po
+++ b/addons/product_expiry/i18n/el.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-12 08:45+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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
@@ -22,14 +22,6 @@ msgstr ""
 msgid "Production lot"
 msgstr "Παρτίδα Παραγωγής"
 
-#. module: product_expiry
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Το όνομα του Αντικειμένου θα πρέπει να ξεκινά με x_ και να μην περιέχει "
-"ειδικούς χαρακτήρες !"
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
 msgid "Ham"
@@ -45,28 +37,32 @@ msgstr "Γάλα Αγελάδας"
 msgid "Products date of expiry"
 msgstr "Ημερομηνία Λήξης Προϊόντων"
 
-#. module: product_expiry
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Λάθος: Η προεπιλεγμένη Μ.Μ και η Μ.Μ αγοράς θα πρέπει να είναι στην ίδια "
-"κατηγορία"
-
 #. module: product_expiry
 #: field:product.product,life_time:0
 msgid "Product Life Time"
 msgstr "Διάρκει Ζωής του προϊόντος"
 
+#. module: product_expiry
+#: help:stock.production.lot,use_date:0
+msgid ""
+"The date on which the lot starts deteriorating without becoming dangerous."
+msgstr ""
+
 #. module: product_expiry
 #: field:product.product,use_time:0
 msgid "Product Use Time"
 msgstr "Χρόνος Χρήσης Προϊόντος"
 
 #. module: product_expiry
-#: help:stock.production.lot,alert_date:0
-msgid "The date signifying an alert to notify about the production lot."
-msgstr "Η ημερομηνία δήλωσης υπενθύμισης για την παρτίδα παραγωγής."
+#: sql_constraint:stock.production.lot:0
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr ""
+
+#. module: product_expiry
+#: help:stock.production.lot,removal_date:0
+msgid "The date on which the lot should be removed."
+msgstr ""
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_product_product
@@ -74,11 +70,11 @@ msgid "Product"
 msgstr "Προϊόν"
 
 #. module: product_expiry
-#: help:stock.production.lot,life_date:0
-msgid "The date the lot may become dangerous and should not be consumed."
+#: help:product.product,alert_time:0
+msgid ""
+"The number of days after which an alert should be notified about the "
+"production lot."
 msgstr ""
-"Η ημερομηνία που η παρτίδα μπορεί να είναι επικίνδυνη και δεν θα πρέπει να "
-"καταναλωθεί"
 
 #. module: product_expiry
 #: field:product.product,removal_time:0
@@ -90,6 +86,12 @@ msgstr "Χρόνος απομάκρυνσης Προϊόντος"
 msgid "Removal Date"
 msgstr "Ημερομηνία Απομάκρυνσης"
 
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid ""
+"The date on which the lot may become dangerous and should not be consumed."
+msgstr ""
+
 #. module: product_expiry
 #: model:ir.module.module,description:product_expiry.module_meta_information
 msgid ""
@@ -123,19 +125,6 @@ msgstr ""
 msgid "Dates"
 msgstr "Ημερομηνίες"
 
-#. module: product_expiry
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-
-#. module: product_expiry
-#: help:product.product,alert_time:0
-msgid ""
-"The number of days after which, needs an alert to notify about the "
-"production lot."
-msgstr ""
-"Ο αριθμός ημερών που θα χρειαστεί να γίνει υπενθήμιση για την παρτίδα."
-
 #. module: product_expiry
 #: field:stock.production.lot,life_date:0
 msgid "End of Life Date"
@@ -146,12 +135,6 @@ msgstr "Ημερομηνία Λήξης Ζωής"
 msgid "Best before Date"
 msgstr "Ανάλωση κατά προτίμηση πριν την ημερομηνία"
 
-#. module: product_expiry
-#: help:stock.production.lot,use_date:0
-msgid "The date the lot starts deteriorating without becoming dangerous."
-msgstr ""
-"Η ημερομηνία που η παρτίδα αρχίζει να χαλάει χωρίς να γίνεται επικίνδυνη"
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_jambon_product_template
 msgid "French cheese Camenbert"
@@ -162,11 +145,6 @@ msgstr "Γαλλικό τυρί Camenbert"
 msgid "The number of days before a production lot should be removed."
 msgstr "Ο αριθμός ημερών πριν χρειαστεί να απομακρυνθεί η παρτίδα"
 
-#. module: product_expiry
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: product_expiry
 #: help:product.product,use_time:0
 msgid ""
@@ -189,11 +167,45 @@ msgstr ""
 "να καταναλωθεί"
 
 #. module: product_expiry
-#: help:stock.production.lot,removal_date:0
-msgid "The date the lot should be removed."
-msgstr "Η ημερομηνία που η παρτίδα πρέπει να απομακρυνθεί."
+#: help:stock.production.lot,alert_date:0
+msgid ""
+"The date on which an alert should be notified about the production lot."
+msgstr ""
 
 #. module: product_expiry
 #: field:product.product,alert_time:0
 msgid "Product Alert Time"
 msgstr "Ύπενθύμιση Προϊόντος"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Το όνομα του Αντικειμένου θα πρέπει να ξεκινά με x_ και να μην περιέχει "
+#~ "ειδικούς χαρακτήρες !"
+
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Λάθος: Η προεπιλεγμένη Μ.Μ και η Μ.Μ αγοράς θα πρέπει να είναι στην ίδια "
+#~ "κατηγορία"
+
+#~ msgid ""
+#~ "The number of days after which, needs an alert to notify about the "
+#~ "production lot."
+#~ msgstr ""
+#~ "Ο αριθμός ημερών που θα χρειαστεί να γίνει υπενθήμιση για την παρτίδα."
+
+#~ msgid "The date the lot may become dangerous and should not be consumed."
+#~ msgstr ""
+#~ "Η ημερομηνία που η παρτίδα μπορεί να είναι επικίνδυνη και δεν θα πρέπει να "
+#~ "καταναλωθεί"
+
+#~ msgid "The date the lot should be removed."
+#~ msgstr "Η ημερομηνία που η παρτίδα πρέπει να απομακρυνθεί."
+
+#~ msgid "The date signifying an alert to notify about the production lot."
+#~ msgstr "Η ημερομηνία δήλωσης υπενθύμισης για την παρτίδα παραγωγής."
+
+#~ msgid "The date the lot starts deteriorating without becoming dangerous."
+#~ msgstr ""
+#~ "Η ημερομηνία που η παρτίδα αρχίζει να χαλάει χωρίς να γίνεται επικίνδυνη"
diff --git a/addons/product_expiry/i18n/es.po b/addons/product_expiry/i18n/es.po
index bd3a839ac7a..6fc8208df86 100644
--- a/addons/product_expiry/i18n/es.po
+++ b/addons/product_expiry/i18n/es.po
@@ -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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
diff --git a/addons/product_expiry/i18n/es_EC.po b/addons/product_expiry/i18n/es_EC.po
index 9c143d10858..02e5ac9628b 100644
--- a/addons/product_expiry/i18n/es_EC.po
+++ b/addons/product_expiry/i18n/es_EC.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-19 00:08+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-10-30 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
@@ -22,12 +22,6 @@ msgstr ""
 msgid "Production lot"
 msgstr ""
 
-#. module: product_expiry
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
 msgid "Ham"
@@ -43,27 +37,31 @@ msgstr "Leche de vaca"
 msgid "Products date of expiry"
 msgstr "Fecha de caducidad de productos"
 
-#. module: product_expiry
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Error: La UdM por defecto y la UdM de compra deben estar en la misma "
-"categoría."
-
 #. module: product_expiry
 #: field:product.product,life_time:0
 msgid "Product Life Time"
 msgstr ""
 
+#. module: product_expiry
+#: help:stock.production.lot,use_date:0
+msgid ""
+"The date on which the lot starts deteriorating without becoming dangerous."
+msgstr ""
+
 #. module: product_expiry
 #: field:product.product,use_time:0
 msgid "Product Use Time"
 msgstr ""
 
 #. module: product_expiry
-#: help:stock.production.lot,alert_date:0
-msgid "The date signifying an alert to notify about the production lot."
+#: sql_constraint:stock.production.lot:0
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr ""
+
+#. module: product_expiry
+#: help:stock.production.lot,removal_date:0
+msgid "The date on which the lot should be removed."
 msgstr ""
 
 #. module: product_expiry
@@ -72,11 +70,11 @@ msgid "Product"
 msgstr ""
 
 #. module: product_expiry
-#: help:stock.production.lot,life_date:0
-msgid "The date the lot may become dangerous and should not be consumed."
+#: help:product.product,alert_time:0
+msgid ""
+"The number of days after which an alert should be notified about the "
+"production lot."
 msgstr ""
-"Fecha en la que el producto puede llegar a ser peligroso y no debería ser "
-"consumido."
 
 #. module: product_expiry
 #: field:product.product,removal_time:0
@@ -88,6 +86,12 @@ msgstr ""
 msgid "Removal Date"
 msgstr "Fecha de eliminación"
 
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid ""
+"The date on which the lot may become dangerous and should not be consumed."
+msgstr ""
+
 #. module: product_expiry
 #: model:ir.module.module,description:product_expiry.module_meta_information
 msgid ""
@@ -122,18 +126,6 @@ msgstr ""
 msgid "Dates"
 msgstr "Fechas"
 
-#. module: product_expiry
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr "Error: La UdV debe estar en una categoría diferente que la UdM."
-
-#. module: product_expiry
-#: help:product.product,alert_time:0
-msgid ""
-"The number of days after which, needs an alert to notify about the "
-"production lot."
-msgstr ""
-
 #. module: product_expiry
 #: field:stock.production.lot,life_date:0
 msgid "End of Life Date"
@@ -144,13 +136,6 @@ msgstr "Fecha de fin de vida"
 msgid "Best before Date"
 msgstr "Fecha caducidad"
 
-#. module: product_expiry
-#: help:stock.production.lot,use_date:0
-msgid "The date the lot starts deteriorating without becoming dangerous."
-msgstr ""
-"Fecha en la que el producto empieza a deteriorarse sin llegar a ser "
-"peligroso."
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_jambon_product_template
 msgid "French cheese Camenbert"
@@ -161,11 +146,6 @@ msgstr "Queso Camembert francés"
 msgid "The number of days before a production lot should be removed."
 msgstr "Número de días antes de que un lote de producción deba ser retirado."
 
-#. module: product_expiry
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la definición de la vista!"
-
 #. module: product_expiry
 #: help:product.product,use_time:0
 msgid ""
@@ -190,9 +170,10 @@ msgstr ""
 "debe ser consumido."
 
 #. module: product_expiry
-#: help:stock.production.lot,removal_date:0
-msgid "The date the lot should be removed."
-msgstr "Fecha en la que el producto debería ser eliminado."
+#: help:stock.production.lot,alert_date:0
+msgid ""
+"The date on which an alert should be notified about the production lot."
+msgstr ""
 
 #. module: product_expiry
 #: field:product.product,alert_time:0
diff --git a/addons/product_expiry/i18n/et.po b/addons/product_expiry/i18n/et.po
index 89dd3bdac31..e46691989f5 100644
--- a/addons/product_expiry/i18n/et.po
+++ b/addons/product_expiry/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-06-25 18:04+0000\n"
 "Last-Translator: lyyser <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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
@@ -22,12 +22,6 @@ msgstr ""
 msgid "Production lot"
 msgstr ""
 
-#. module: product_expiry
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
 msgid "Ham"
@@ -43,26 +37,31 @@ msgstr "Lehma piim"
 msgid "Products date of expiry"
 msgstr "Kõlblik kuni"
 
-#. module: product_expiry
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Viga: vaikimisi mõõtühik ja ostu mõõtühik peavad olema samast kategooriast."
-
 #. module: product_expiry
 #: field:product.product,life_time:0
 msgid "Product Life Time"
 msgstr ""
 
+#. module: product_expiry
+#: help:stock.production.lot,use_date:0
+msgid ""
+"The date on which the lot starts deteriorating without becoming dangerous."
+msgstr ""
+
 #. module: product_expiry
 #: field:product.product,use_time:0
 msgid "Product Use Time"
 msgstr ""
 
 #. module: product_expiry
-#: help:stock.production.lot,alert_date:0
-msgid "The date signifying an alert to notify about the production lot."
+#: sql_constraint:stock.production.lot:0
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr ""
+
+#. module: product_expiry
+#: help:stock.production.lot,removal_date:0
+msgid "The date on which the lot should be removed."
 msgstr ""
 
 #. module: product_expiry
@@ -71,10 +70,11 @@ msgid "Product"
 msgstr ""
 
 #. module: product_expiry
-#: help:stock.production.lot,life_date:0
-msgid "The date the lot may become dangerous and should not be consumed."
+#: help:product.product,alert_time:0
+msgid ""
+"The number of days after which an alert should be notified about the "
+"production lot."
 msgstr ""
-"Kuupäev, millal toode võib muutuda ohtlikuks ning neid ei tohiks tarbida."
 
 #. module: product_expiry
 #: field:product.product,removal_time:0
@@ -86,6 +86,12 @@ msgstr ""
 msgid "Removal Date"
 msgstr ""
 
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid ""
+"The date on which the lot may become dangerous and should not be consumed."
+msgstr ""
+
 #. module: product_expiry
 #: model:ir.module.module,description:product_expiry.module_meta_information
 msgid ""
@@ -114,18 +120,6 @@ msgstr "LTR"
 msgid "Dates"
 msgstr "Kuupäevad"
 
-#. module: product_expiry
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr "Viga: TÜ kategooria peab erinema MÜ kategooriast"
-
-#. module: product_expiry
-#: help:product.product,alert_time:0
-msgid ""
-"The number of days after which, needs an alert to notify about the "
-"production lot."
-msgstr ""
-
 #. module: product_expiry
 #: field:stock.production.lot,life_date:0
 msgid "End of Life Date"
@@ -136,11 +130,6 @@ msgstr "Kõlblik kuni kuupäev"
 msgid "Best before Date"
 msgstr "Parim enne kuupäev"
 
-#. module: product_expiry
-#: help:stock.production.lot,use_date:0
-msgid "The date the lot starts deteriorating without becoming dangerous."
-msgstr ""
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_jambon_product_template
 msgid "French cheese Camenbert"
@@ -151,11 +140,6 @@ msgstr "Prantsuse juustu Camenbert"
 msgid "The number of days before a production lot should be removed."
 msgstr "Päevade arv ennem mida tootepartii tuleb eemaldada."
 
-#. module: product_expiry
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
 #. module: product_expiry
 #: help:product.product,use_time:0
 msgid ""
@@ -178,21 +162,40 @@ msgstr ""
 "tarbida."
 
 #. module: product_expiry
-#: help:stock.production.lot,removal_date:0
-msgid "The date the lot should be removed."
-msgstr "Kuupäeva millal toode tuleks kõrvaldada."
+#: help:stock.production.lot,alert_date:0
+msgid ""
+"The date on which an alert should be notified about the production lot."
+msgstr ""
 
 #. module: product_expiry
 #: field:product.product,alert_time:0
 msgid "Product Alert Time"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Vigane XML vaate arhitektuurile!"
+
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Viga: vaikimisi mõõtühik ja ostu mõõtühik peavad olema samast kategooriast."
+
+#~ msgid "The date the lot may become dangerous and should not be consumed."
+#~ msgstr ""
+#~ "Kuupäev, millal toode võib muutuda ohtlikuks ning neid ei tohiks tarbida."
+
 #~ msgid "Product usetime"
 #~ msgstr "Toote kasutamise aeg"
 
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr "Viga: TÜ kategooria peab erinema MÜ kategooriast"
+
 #~ msgid "Alert Date"
 #~ msgstr "Häire kuupäev"
 
+#~ msgid "The date the lot should be removed."
+#~ msgstr "Kuupäeva millal toode tuleks kõrvaldada."
+
 #~ msgid "Product removal time"
 #~ msgstr "Toote eemaldamise aeg"
 
diff --git a/addons/product_expiry/i18n/fr.po b/addons/product_expiry/i18n/fr.po
index 8195139de7f..e9bb14c54b8 100644
--- a/addons/product_expiry/i18n/fr.po
+++ b/addons/product_expiry/i18n/fr.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-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
diff --git a/addons/product_expiry/i18n/hr.po b/addons/product_expiry/i18n/hr.po
index ca6febf7836..d5f11d39dac 100644
--- a/addons/product_expiry/i18n/hr.po
+++ b/addons/product_expiry/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-29 10:30+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
@@ -22,12 +22,6 @@ msgstr ""
 msgid "Production lot"
 msgstr ""
 
-#. module: product_expiry
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
 msgid "Ham"
@@ -43,26 +37,31 @@ msgstr "Kravlje mlijeko"
 msgid "Products date of expiry"
 msgstr "Datum isteka roka trajanja"
 
-#. module: product_expiry
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Pogreška: Predefinirana JM i prodajna JM moraju pripadati istoj kategoriji."
-
 #. module: product_expiry
 #: field:product.product,life_time:0
 msgid "Product Life Time"
 msgstr ""
 
+#. module: product_expiry
+#: help:stock.production.lot,use_date:0
+msgid ""
+"The date on which the lot starts deteriorating without becoming dangerous."
+msgstr ""
+
 #. module: product_expiry
 #: field:product.product,use_time:0
 msgid "Product Use Time"
 msgstr ""
 
 #. module: product_expiry
-#: help:stock.production.lot,alert_date:0
-msgid "The date signifying an alert to notify about the production lot."
+#: sql_constraint:stock.production.lot:0
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr ""
+
+#. module: product_expiry
+#: help:stock.production.lot,removal_date:0
+msgid "The date on which the lot should be removed."
 msgstr ""
 
 #. module: product_expiry
@@ -71,10 +70,11 @@ msgid "Product"
 msgstr ""
 
 #. module: product_expiry
-#: help:stock.production.lot,life_date:0
-msgid "The date the lot may become dangerous and should not be consumed."
+#: help:product.product,alert_time:0
+msgid ""
+"The number of days after which an alert should be notified about the "
+"production lot."
 msgstr ""
-"Datum kada serija proizvoda postaje opasna i ne smije se konzumirati."
 
 #. module: product_expiry
 #: field:product.product,removal_time:0
@@ -86,6 +86,12 @@ msgstr ""
 msgid "Removal Date"
 msgstr "Datum uklanjanja"
 
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid ""
+"The date on which the lot may become dangerous and should not be consumed."
+msgstr ""
+
 #. module: product_expiry
 #: model:ir.module.module,description:product_expiry.module_meta_information
 msgid ""
@@ -112,7 +118,7 @@ msgstr "Kruh"
 #: model:product.uom,name:product_expiry.product_uom_ltr
 #: model:product.uom.categ,name:product_expiry.product_uom_categ_vol
 msgid "LTR"
-msgstr ""
+msgstr "LTR"
 
 #. module: product_expiry
 #: view:product.product:0
@@ -120,18 +126,6 @@ msgstr ""
 msgid "Dates"
 msgstr "Datumi"
 
-#. module: product_expiry
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr "Pogreška: UOS mora biti u različitoj kategoriji od JM"
-
-#. module: product_expiry
-#: help:product.product,alert_time:0
-msgid ""
-"The number of days after which, needs an alert to notify about the "
-"production lot."
-msgstr ""
-
 #. module: product_expiry
 #: field:stock.production.lot,life_date:0
 msgid "End of Life Date"
@@ -142,12 +136,6 @@ msgstr "Istek roka trajanja"
 msgid "Best before Date"
 msgstr "Najbolje prije"
 
-#. module: product_expiry
-#: help:stock.production.lot,use_date:0
-msgid "The date the lot starts deteriorating without becoming dangerous."
-msgstr ""
-"Datum kada serija proizvoda počinje propadati, a da nije opasna po zdravlje."
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_jambon_product_template
 msgid "French cheese Camenbert"
@@ -159,11 +147,6 @@ msgid "The number of days before a production lot should be removed."
 msgstr ""
 "Broj dana prije  nego što bi trebalo maknuti produkcijsku seriju proizvoda."
 
-#. module: product_expiry
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neispravan XML za arhitekturu View-a"
-
 #. module: product_expiry
 #: help:product.product,use_time:0
 msgid ""
@@ -188,9 +171,10 @@ msgstr ""
 "konzumirati."
 
 #. module: product_expiry
-#: help:stock.production.lot,removal_date:0
-msgid "The date the lot should be removed."
-msgstr "Datum kada bi trebalo maknuti seriju proizvoda."
+#: help:stock.production.lot,alert_date:0
+msgid ""
+"The date on which an alert should be notified about the production lot."
+msgstr ""
 
 #. module: product_expiry
 #: field:product.product,alert_time:0
@@ -200,6 +184,25 @@ msgstr ""
 #~ msgid "Product lifetime"
 #~ msgstr "Trajnost proizvoda"
 
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Pogreška: Predefinirana JM i prodajna JM moraju pripadati istoj kategoriji."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neispravan XML za arhitekturu View-a"
+
+#~ msgid "The date the lot may become dangerous and should not be consumed."
+#~ msgstr ""
+#~ "Datum kada serija proizvoda postaje opasna i ne smije se konzumirati."
+
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr "Pogreška: UOS mora biti u različitoj kategoriji od JM"
+
+#~ msgid "The date the lot starts deteriorating without becoming dangerous."
+#~ msgstr ""
+#~ "Datum kada serija proizvoda počinje propadati, a da nije opasna po zdravlje."
+
 #~ msgid "Product usetime"
 #~ msgstr "Trajanje proizvoda"
 
@@ -209,5 +212,8 @@ msgstr ""
 #~ msgid "Product removal time"
 #~ msgstr "Vrijeme uklanjanja proizvoda"
 
+#~ msgid "The date the lot should be removed."
+#~ msgstr "Datum kada bi trebalo maknuti seriju proizvoda."
+
 #~ msgid "Product alert time"
 #~ msgstr "Vrijeme alarma proizvoda"
diff --git a/addons/product_expiry/i18n/mn.po b/addons/product_expiry/i18n/mn.po
index 2abba0942a3..ec3a32b288f 100644
--- a/addons/product_expiry/i18n/mn.po
+++ b/addons/product_expiry/i18n/mn.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-24 11:28+0000\n"
 "Last-Translator: sugi <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-11-25 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
@@ -21,14 +21,6 @@ msgstr ""
 msgid "Production lot"
 msgstr "Үйлдвэрлэлийн цуврал"
 
-#. module: product_expiry
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-"болохгүй !"
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
 msgid "Ham"
@@ -44,20 +36,15 @@ msgstr ""
 msgid "Products date of expiry"
 msgstr "Барааны дуусгавар болох хугацаа"
 
-#. module: product_expiry
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-
 #. module: product_expiry
 #: field:product.product,life_time:0
 msgid "Product Life Time"
 msgstr "Дуусах хугацаа"
 
 #. module: product_expiry
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
+#: help:stock.production.lot,use_date:0
+msgid ""
+"The date on which the lot starts deteriorating without becoming dangerous."
 msgstr ""
 
 #. module: product_expiry
@@ -66,13 +53,14 @@ msgid "Product Use Time"
 msgstr "Хэрэглэх хугацаа"
 
 #. module: product_expiry
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
+#: sql_constraint:stock.production.lot:0
+msgid ""
+"The combination of serial number and internal reference must be unique !"
 msgstr ""
 
 #. module: product_expiry
-#: help:stock.production.lot,alert_date:0
-msgid "The date signifying an alert to notify about the production lot."
+#: help:stock.production.lot,removal_date:0
+msgid "The date on which the lot should be removed."
 msgstr ""
 
 #. module: product_expiry
@@ -81,8 +69,10 @@ msgid "Product"
 msgstr "Бүтээгдэхүүн"
 
 #. module: product_expiry
-#: help:stock.production.lot,life_date:0
-msgid "The date the lot may become dangerous and should not be consumed."
+#: help:product.product,alert_time:0
+msgid ""
+"The number of days after which an alert should be notified about the "
+"production lot."
 msgstr ""
 
 #. module: product_expiry
@@ -95,6 +85,12 @@ msgstr "Устгах хугацаа"
 msgid "Removal Date"
 msgstr "Устгах огноо"
 
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid ""
+"The date on which the lot may become dangerous and should not be consumed."
+msgstr ""
+
 #. module: product_expiry
 #: model:ir.module.module,description:product_expiry.module_meta_information
 msgid ""
@@ -123,23 +119,6 @@ msgstr ""
 msgid "Dates"
 msgstr "Огноо"
 
-#. module: product_expiry
-#: sql_constraint:product.uom:0
-msgid "The conversion ratio for a unit of measure cannot be 0!"
-msgstr ""
-
-#. module: product_expiry
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-
-#. module: product_expiry
-#: help:product.product,alert_time:0
-msgid ""
-"The number of days after which, needs an alert to notify about the "
-"production lot."
-msgstr ""
-
 #. module: product_expiry
 #: field:stock.production.lot,life_date:0
 msgid "End of Life Date"
@@ -150,11 +129,6 @@ msgstr "Дуусах огноо"
 msgid "Best before Date"
 msgstr ""
 
-#. module: product_expiry
-#: help:stock.production.lot,use_date:0
-msgid "The date the lot starts deteriorating without becoming dangerous."
-msgstr ""
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_jambon_product_template
 msgid "French cheese Camenbert"
@@ -165,11 +139,6 @@ msgstr ""
 msgid "The number of days before a production lot should be removed."
 msgstr ""
 
-#. module: product_expiry
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Дэлгэцийн архитектур алдаатай!"
-
 #. module: product_expiry
 #: help:product.product,use_time:0
 msgid ""
@@ -190,8 +159,9 @@ msgid ""
 msgstr ""
 
 #. module: product_expiry
-#: help:stock.production.lot,removal_date:0
-msgid "The date the lot should be removed."
+#: help:stock.production.lot,alert_date:0
+msgid ""
+"The date on which an alert should be notified about the production lot."
 msgstr ""
 
 #. module: product_expiry
@@ -199,10 +169,14 @@ msgstr ""
 msgid "Product Alert Time"
 msgstr "Анхааруулах хугацаа"
 
-#. module: product_expiry
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+#~ "болохгүй !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Дэлгэцийн архитектур алдаатай!"
 
 #~ msgid "Alert Date"
 #~ msgstr "Анхааруулах огноо"
diff --git a/addons/product_expiry/i18n/pl.po b/addons/product_expiry/i18n/pl.po
index ccfcd9b2574..6c31042cdb6 100644
--- a/addons/product_expiry/i18n/pl.po
+++ b/addons/product_expiry/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-10-08 07:39+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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
@@ -22,12 +22,6 @@ msgstr ""
 msgid "Production lot"
 msgstr ""
 
-#. module: product_expiry
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
 msgid "Ham"
@@ -43,25 +37,31 @@ msgstr "Mleko"
 msgid "Products date of expiry"
 msgstr "Data przydatności"
 
-#. module: product_expiry
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "Błąd: domyślna JM i zakupowa JM muszą być tej samej kategorii."
-
 #. module: product_expiry
 #: field:product.product,life_time:0
 msgid "Product Life Time"
 msgstr ""
 
+#. module: product_expiry
+#: help:stock.production.lot,use_date:0
+msgid ""
+"The date on which the lot starts deteriorating without becoming dangerous."
+msgstr ""
+
 #. module: product_expiry
 #: field:product.product,use_time:0
 msgid "Product Use Time"
 msgstr ""
 
 #. module: product_expiry
-#: help:stock.production.lot,alert_date:0
-msgid "The date signifying an alert to notify about the production lot."
+#: sql_constraint:stock.production.lot:0
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr ""
+
+#. module: product_expiry
+#: help:stock.production.lot,removal_date:0
+msgid "The date on which the lot should be removed."
 msgstr ""
 
 #. module: product_expiry
@@ -70,8 +70,10 @@ msgid "Product"
 msgstr ""
 
 #. module: product_expiry
-#: help:stock.production.lot,life_date:0
-msgid "The date the lot may become dangerous and should not be consumed."
+#: help:product.product,alert_time:0
+msgid ""
+"The number of days after which an alert should be notified about the "
+"production lot."
 msgstr ""
 
 #. module: product_expiry
@@ -84,6 +86,12 @@ msgstr ""
 msgid "Removal Date"
 msgstr "Data usunięcia"
 
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid ""
+"The date on which the lot may become dangerous and should not be consumed."
+msgstr ""
+
 #. module: product_expiry
 #: model:ir.module.module,description:product_expiry.module_meta_information
 msgid ""
@@ -118,18 +126,6 @@ msgstr ""
 msgid "Dates"
 msgstr "Daty"
 
-#. module: product_expiry
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr "Błąd: JS musi być innej kategorii niż JM."
-
-#. module: product_expiry
-#: help:product.product,alert_time:0
-msgid ""
-"The number of days after which, needs an alert to notify about the "
-"production lot."
-msgstr ""
-
 #. module: product_expiry
 #: field:stock.production.lot,life_date:0
 msgid "End of Life Date"
@@ -140,11 +136,6 @@ msgstr "Koniec przydatności"
 msgid "Best before Date"
 msgstr "Data najlepszego użycia"
 
-#. module: product_expiry
-#: help:stock.production.lot,use_date:0
-msgid "The date the lot starts deteriorating without becoming dangerous."
-msgstr ""
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_jambon_product_template
 msgid "French cheese Camenbert"
@@ -155,11 +146,6 @@ msgstr "Cammembert"
 msgid "The number of days before a production lot should be removed."
 msgstr ""
 
-#. module: product_expiry
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Niewłaściwy XML dla architektury widoku!"
-
 #. module: product_expiry
 #: help:product.product,use_time:0
 msgid ""
@@ -180,21 +166,35 @@ msgid ""
 msgstr ""
 
 #. module: product_expiry
-#: help:stock.production.lot,removal_date:0
-msgid "The date the lot should be removed."
-msgstr "Data, w której produkt powinien być usunięty"
+#: help:stock.production.lot,alert_date:0
+msgid ""
+"The date on which an alert should be notified about the production lot."
+msgstr ""
 
 #. module: product_expiry
 #: field:product.product,alert_time:0
 msgid "Product Alert Time"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Niewłaściwy XML dla architektury widoku!"
+
 #~ msgid "Product lifetime"
 #~ msgstr "Okres przydatności produktu"
 
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr "Błąd: domyślna JM i zakupowa JM muszą być tej samej kategorii."
+
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr "Błąd: JS musi być innej kategorii niż JM."
+
 #~ msgid "Alert Date"
 #~ msgstr "Data ostrzegawcza"
 
+#~ msgid "The date the lot should be removed."
+#~ msgstr "Data, w której produkt powinien być usunięty"
+
 #~ msgid "Product removal time"
 #~ msgstr "Czas wycofania produktu"
 
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/pt.po b/addons/product_expiry/i18n/pt.po
index df028d75dcc..5edc19cc76d 100644
--- a/addons/product_expiry/i18n/pt.po
+++ b/addons/product_expiry/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-12 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
diff --git a/addons/product_expiry/i18n/ru.po b/addons/product_expiry/i18n/ru.po
index a35ca23b595..a4becbe2b78 100644
--- a/addons/product_expiry/i18n/ru.po
+++ b/addons/product_expiry/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-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-22 07:21+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-11-23 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
@@ -22,14 +22,6 @@ msgstr ""
 msgid "Production lot"
 msgstr "Партия изделий"
 
-#. module: product_expiry
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
 msgid "Ham"
@@ -45,23 +37,16 @@ msgstr "Коровье молоко"
 msgid "Products date of expiry"
 msgstr ""
 
-#. module: product_expiry
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Ошибка. ед. изм. по умолчанию и закупочные ед. изм. должны иметь одинаковую "
-"категорию."
-
 #. module: product_expiry
 #: field:product.product,life_time:0
 msgid "Product Life Time"
 msgstr ""
 
 #. module: product_expiry
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Название модуля должно быть уникальным !"
+#: help:stock.production.lot,use_date:0
+msgid ""
+"The date on which the lot starts deteriorating without becoming dangerous."
+msgstr ""
 
 #. module: product_expiry
 #: field:product.product,use_time:0
@@ -69,13 +54,14 @@ msgid "Product Use Time"
 msgstr ""
 
 #. module: product_expiry
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Идентификатор сертификата модуля должен быть уникальным !"
+#: sql_constraint:stock.production.lot:0
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr ""
 
 #. module: product_expiry
-#: help:stock.production.lot,alert_date:0
-msgid "The date signifying an alert to notify about the production lot."
+#: help:stock.production.lot,removal_date:0
+msgid "The date on which the lot should be removed."
 msgstr ""
 
 #. module: product_expiry
@@ -84,8 +70,10 @@ msgid "Product"
 msgstr "ТМЦ"
 
 #. module: product_expiry
-#: help:stock.production.lot,life_date:0
-msgid "The date the lot may become dangerous and should not be consumed."
+#: help:product.product,alert_time:0
+msgid ""
+"The number of days after which an alert should be notified about the "
+"production lot."
 msgstr ""
 
 #. module: product_expiry
@@ -98,6 +86,12 @@ msgstr ""
 msgid "Removal Date"
 msgstr ""
 
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid ""
+"The date on which the lot may become dangerous and should not be consumed."
+msgstr ""
+
 #. module: product_expiry
 #: model:ir.module.module,description:product_expiry.module_meta_information
 msgid ""
@@ -126,26 +120,6 @@ msgstr ""
 msgid "Dates"
 msgstr "Даты"
 
-#. module: product_expiry
-#: sql_constraint:product.uom:0
-msgid "The conversion ratio for a unit of measure cannot be 0!"
-msgstr ""
-"Коэффициент преобразования для единиц измерения не может быть нулевым !"
-
-#. module: product_expiry
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-"Ошибка. Единицы продажи и единицы измерения должны принадлежать к разным "
-"категориям."
-
-#. module: product_expiry
-#: help:product.product,alert_time:0
-msgid ""
-"The number of days after which, needs an alert to notify about the "
-"production lot."
-msgstr ""
-
 #. module: product_expiry
 #: field:stock.production.lot,life_date:0
 msgid "End of Life Date"
@@ -156,11 +130,6 @@ msgstr ""
 msgid "Best before Date"
 msgstr ""
 
-#. module: product_expiry
-#: help:stock.production.lot,use_date:0
-msgid "The date the lot starts deteriorating without becoming dangerous."
-msgstr ""
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_jambon_product_template
 msgid "French cheese Camenbert"
@@ -171,11 +140,6 @@ msgstr ""
 msgid "The number of days before a production lot should be removed."
 msgstr ""
 
-#. module: product_expiry
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
-
 #. module: product_expiry
 #: help:product.product,use_time:0
 msgid ""
@@ -196,8 +160,9 @@ msgid ""
 msgstr ""
 
 #. module: product_expiry
-#: help:stock.production.lot,removal_date:0
-msgid "The date the lot should be removed."
+#: help:stock.production.lot,alert_date:0
+msgid ""
+"The date on which an alert should be notified about the production lot."
 msgstr ""
 
 #. module: product_expiry
@@ -205,7 +170,35 @@ msgstr ""
 msgid "Product Alert Time"
 msgstr ""
 
-#. module: product_expiry
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Размер поля никогда не может быть меньше 1 !"
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Название модуля должно быть уникальным !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
+
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Ошибка. ед. изм. по умолчанию и закупочные ед. изм. должны иметь одинаковую "
+#~ "категорию."
+
+#~ msgid "The conversion ratio for a unit of measure cannot be 0!"
+#~ msgstr ""
+#~ "Коэффициент преобразования для единиц измерения не может быть нулевым !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра архитектуры!"
+
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr ""
+#~ "Ошибка. Единицы продажи и единицы измерения должны принадлежать к разным "
+#~ "категориям."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Размер поля никогда не может быть меньше 1 !"
diff --git a/addons/product_expiry/i18n/sl.po b/addons/product_expiry/i18n/sl.po
index d56ff1f5d02..5ca68b2a10a 100644
--- a/addons/product_expiry/i18n/sl.po
+++ b/addons/product_expiry/i18n/sl.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-07-28 12:28+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-10-30 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
@@ -22,12 +22,6 @@ msgstr ""
 msgid "Production lot"
 msgstr ""
 
-#. module: product_expiry
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
 msgid "Ham"
@@ -43,25 +37,31 @@ msgstr "Kravje mleko"
 msgid "Products date of expiry"
 msgstr ""
 
-#. module: product_expiry
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "Napaka: Privzeta EM in nabavna EM morata biti v isti kategoriji."
-
 #. module: product_expiry
 #: field:product.product,life_time:0
 msgid "Product Life Time"
 msgstr ""
 
+#. module: product_expiry
+#: help:stock.production.lot,use_date:0
+msgid ""
+"The date on which the lot starts deteriorating without becoming dangerous."
+msgstr ""
+
 #. module: product_expiry
 #: field:product.product,use_time:0
 msgid "Product Use Time"
 msgstr ""
 
 #. module: product_expiry
-#: help:stock.production.lot,alert_date:0
-msgid "The date signifying an alert to notify about the production lot."
+#: sql_constraint:stock.production.lot:0
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr ""
+
+#. module: product_expiry
+#: help:stock.production.lot,removal_date:0
+msgid "The date on which the lot should be removed."
 msgstr ""
 
 #. module: product_expiry
@@ -70,8 +70,10 @@ msgid "Product"
 msgstr ""
 
 #. module: product_expiry
-#: help:stock.production.lot,life_date:0
-msgid "The date the lot may become dangerous and should not be consumed."
+#: help:product.product,alert_time:0
+msgid ""
+"The number of days after which an alert should be notified about the "
+"production lot."
 msgstr ""
 
 #. module: product_expiry
@@ -84,6 +86,12 @@ msgstr ""
 msgid "Removal Date"
 msgstr ""
 
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid ""
+"The date on which the lot may become dangerous and should not be consumed."
+msgstr ""
+
 #. module: product_expiry
 #: model:ir.module.module,description:product_expiry.module_meta_information
 msgid ""
@@ -112,18 +120,6 @@ msgstr ""
 msgid "Dates"
 msgstr "Datumi"
 
-#. module: product_expiry
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr "Napaka: Prodajna EM mora biti v drugi kategoriji, kot je EM"
-
-#. module: product_expiry
-#: help:product.product,alert_time:0
-msgid ""
-"The number of days after which, needs an alert to notify about the "
-"production lot."
-msgstr ""
-
 #. module: product_expiry
 #: field:stock.production.lot,life_date:0
 msgid "End of Life Date"
@@ -134,11 +130,6 @@ msgstr ""
 msgid "Best before Date"
 msgstr ""
 
-#. module: product_expiry
-#: help:stock.production.lot,use_date:0
-msgid "The date the lot starts deteriorating without becoming dangerous."
-msgstr ""
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_jambon_product_template
 msgid "French cheese Camenbert"
@@ -149,11 +140,6 @@ msgstr ""
 msgid "The number of days before a production lot should be removed."
 msgstr ""
 
-#. module: product_expiry
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda!"
-
 #. module: product_expiry
 #: help:product.product,use_time:0
 msgid ""
@@ -174,11 +160,22 @@ msgid ""
 msgstr ""
 
 #. module: product_expiry
-#: help:stock.production.lot,removal_date:0
-msgid "The date the lot should be removed."
+#: help:stock.production.lot,alert_date:0
+msgid ""
+"The date on which an alert should be notified about the production lot."
 msgstr ""
 
 #. module: product_expiry
 #: field:product.product,alert_time:0
 msgid "Product Alert Time"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda!"
+
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr "Napaka: Privzeta EM in nabavna EM morata biti v isti kategoriji."
+
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr "Napaka: Prodajna EM mora biti v drugi kategoriji, kot je EM"
diff --git a/addons/product_expiry/i18n/sr.po b/addons/product_expiry/i18n/sr.po
index 45e7600a525..efd320fa8f1 100644
--- a/addons/product_expiry/i18n/sr.po
+++ b/addons/product_expiry/i18n/sr.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-04 08:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-06 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
@@ -22,13 +22,6 @@ msgstr ""
 msgid "Production lot"
 msgstr "Serija Proizvodnje"
 
-#. module: product_expiry
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
 msgid "Ham"
@@ -44,27 +37,32 @@ msgstr "Kravlje Mleko"
 msgid "Products date of expiry"
 msgstr "Datum isteka roka trajanja"
 
-#. module: product_expiry
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Greška: Podrazumevana JM i kupljena JM moraju da budu u istoj kategoriji."
-
 #. module: product_expiry
 #: field:product.product,life_time:0
 msgid "Product Life Time"
 msgstr "Rok TRajanja Proizvoda"
 
+#. module: product_expiry
+#: help:stock.production.lot,use_date:0
+msgid ""
+"The date on which the lot starts deteriorating without becoming dangerous."
+msgstr ""
+
 #. module: product_expiry
 #: field:product.product,use_time:0
 msgid "Product Use Time"
 msgstr "Upotrebno Vreme Proizvoda"
 
 #. module: product_expiry
-#: help:stock.production.lot,alert_date:0
-msgid "The date signifying an alert to notify about the production lot."
-msgstr "Datum oznacava upozorenje da bi upozorio na seriju proizvoda."
+#: sql_constraint:stock.production.lot:0
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr ""
+
+#. module: product_expiry
+#: help:stock.production.lot,removal_date:0
+msgid "The date on which the lot should be removed."
+msgstr ""
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_product_product
@@ -72,10 +70,11 @@ msgid "Product"
 msgstr "Proizvod"
 
 #. module: product_expiry
-#: help:stock.production.lot,life_date:0
-msgid "The date the lot may become dangerous and should not be consumed."
+#: help:product.product,alert_time:0
+msgid ""
+"The number of days after which an alert should be notified about the "
+"production lot."
 msgstr ""
-"Datum kada serija proizvoda postaje opasna i ne smije se konzumirati."
 
 #. module: product_expiry
 #: field:product.product,removal_time:0
@@ -87,6 +86,12 @@ msgstr "Vreme Uklanjanja Proizvoda"
 msgid "Removal Date"
 msgstr "Datum uklanjanja"
 
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid ""
+"The date on which the lot may become dangerous and should not be consumed."
+msgstr ""
+
 #. module: product_expiry
 #: model:ir.module.module,description:product_expiry.module_meta_information
 msgid ""
@@ -121,20 +126,6 @@ msgstr ""
 msgid "Dates"
 msgstr "Datumi"
 
-#. module: product_expiry
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-"Greška: JU (jedinice usluga)  i JM moraju da budu u različitim kategorijama"
-
-#. module: product_expiry
-#: help:product.product,alert_time:0
-msgid ""
-"The number of days after which, needs an alert to notify about the "
-"production lot."
-msgstr ""
-"Broj dana, nakon kojih je potrebno upozorenje u vezi serije proizvoda."
-
 #. module: product_expiry
 #: field:stock.production.lot,life_date:0
 msgid "End of Life Date"
@@ -145,12 +136,6 @@ msgstr "Istek roka trajanja"
 msgid "Best before Date"
 msgstr "Najbolje pre Datuma"
 
-#. module: product_expiry
-#: help:stock.production.lot,use_date:0
-msgid "The date the lot starts deteriorating without becoming dangerous."
-msgstr ""
-"Datum kada serija proizvoda počinje propadati, a da nije opasna po zdravlje."
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_jambon_product_template
 msgid "French cheese Camenbert"
@@ -162,11 +147,6 @@ msgid "The number of days before a production lot should be removed."
 msgstr ""
 "Broj dana pre nego što bi trebalo ukloniti produkcijsku seriju proizvoda."
 
-#. module: product_expiry
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za pregled arhitekture"
-
 #. module: product_expiry
 #: help:product.product,use_time:0
 msgid ""
@@ -191,26 +171,64 @@ msgstr ""
 "konzumirati."
 
 #. module: product_expiry
-#: help:stock.production.lot,removal_date:0
-msgid "The date the lot should be removed."
-msgstr "Datum kada bi trebalo ukloniti seriju proizvoda."
+#: help:stock.production.lot,alert_date:0
+msgid ""
+"The date on which an alert should be notified about the production lot."
+msgstr ""
 
 #. module: product_expiry
 #: field:product.product,alert_time:0
 msgid "Product Alert Time"
 msgstr "Vreme Upozorenja Proizvoda"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nevažeći XML za pregled arhitekture"
+
 #~ msgid "Product lifetime"
 #~ msgstr "Rok Trajanja"
 
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Greška: Podrazumevana JM i kupljena JM moraju da budu u istoj kategoriji."
+
+#~ msgid "The date the lot may become dangerous and should not be consumed."
+#~ msgstr ""
+#~ "Datum kada serija proizvoda postaje opasna i ne smije se konzumirati."
+
 #~ msgid "Product usetime"
 #~ msgstr "Trajanje proizvoda"
 
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr ""
+#~ "Greška: JU (jedinice usluga)  i JM moraju da budu u različitim kategorijama"
+
+#~ msgid "The date the lot starts deteriorating without becoming dangerous."
+#~ msgstr ""
+#~ "Datum kada serija proizvoda počinje propadati, a da nije opasna po zdravlje."
+
 #~ msgid "Alert Date"
 #~ msgstr "Datum alarma"
 
+#~ msgid "The date the lot should be removed."
+#~ msgstr "Datum kada bi trebalo ukloniti seriju proizvoda."
+
 #~ msgid "Product removal time"
 #~ msgstr "Vreme uklanjanja proizvoda"
 
 #~ msgid "Product alert time"
 #~ msgstr "Vreme alarma proizvoda"
+
+#~ msgid "The date signifying an alert to notify about the production lot."
+#~ msgstr "Datum oznacava upozorenje da bi upozorio na seriju proizvoda."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
+
+#~ msgid ""
+#~ "The number of days after which, needs an alert to notify about the "
+#~ "production lot."
+#~ msgstr ""
+#~ "Broj dana, nakon kojih je potrebno upozorenje u vezi serije proizvoda."
diff --git a/addons/product_expiry/i18n/sr@latin.po b/addons/product_expiry/i18n/sr@latin.po
index c4ab08129fb..2339a268c09 100644
--- a/addons/product_expiry/i18n/sr@latin.po
+++ b/addons/product_expiry/i18n/sr@latin.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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
diff --git a/addons/product_expiry/i18n/sv.po b/addons/product_expiry/i18n/sv.po
index 8a85e4eef37..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-14 05:34+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/de.po b/addons/product_manufacturer/i18n/de.po
index 1a2c1b4c308..3afbd061ca4 100644
--- a/addons/product_manufacturer/i18n/de.po
+++ b/addons/product_manufacturer/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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-30 12:34+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-01 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
@@ -24,28 +24,16 @@ msgid "Manufacturer Product Code"
 msgstr "Hersteller Produkt Nummer"
 
 #. module: product_manufacturer
-#: 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 !"
-
-#. module: product_manufacturer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter XML-Code für diese Ansicht!"
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "Produkt"
 
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
 msgid "Product Template Name"
 msgstr "Produkt Vorlage NAme"
 
-#. module: product_manufacturer
-#: 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: product_manufacturer
 #: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
 msgid "Product attributes"
@@ -62,26 +50,15 @@ msgstr "Produkt Merkmale"
 msgid "Attribute"
 msgstr "Merkmale"
 
-#. module: product_manufacturer
-#: model:ir.model,name:product_manufacturer.model_product_product
-#: field:product.manufacturer.attribute,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
 #. module: product_manufacturer
 #: field:product.manufacturer.attribute,value:0
 msgid "Value"
 msgstr "Wert"
 
 #. module: product_manufacturer
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#. module: product_manufacturer
-#: 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 !"
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
 
 #. module: product_manufacturer
 #: view:product.product:0
diff --git a/addons/product_manufacturer/i18n/el.po b/addons/product_manufacturer/i18n/el.po
index c329771ec8d..29b9ea63fd1 100644
--- a/addons/product_manufacturer/i18n/el.po
+++ b/addons/product_manufacturer/i18n/el.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-11 15:58+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-11-12 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
@@ -23,22 +23,16 @@ msgid "Manufacturer Product Code"
 msgstr "Κωδικός Κατασκευαστή"
 
 #. module: product_manufacturer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Λαναθασμένο XML για προβολή Αρχιτεκτονικής!"
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "Προϊόν"
 
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
 msgid "Product Template Name"
 msgstr "Όνομα Προτύπου Προϊόντος"
 
-#. module: product_manufacturer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Το Αντικείμενο πρέπει να ξεκινά με x_ και να μην περιέχει ειδικούς χαρακτήρες"
-
 #. module: product_manufacturer
 #: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
 msgid "Product attributes"
@@ -55,17 +49,16 @@ msgstr "Ιδιότητες Προϊόντος"
 msgid "Attribute"
 msgstr "Ιδιότητα"
 
-#. module: product_manufacturer
-#: model:ir.model,name:product_manufacturer.model_product_product
-#: field:product.manufacturer.attribute,product_id:0
-msgid "Product"
-msgstr "Προϊόν"
-
 #. module: product_manufacturer
 #: field:product.manufacturer.attribute,value:0
 msgid "Value"
 msgstr "Τιμή"
 
+#. module: product_manufacturer
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: product_manufacturer
 #: view:product.product:0
 #: field:product.product,attribute_ids:0
diff --git a/addons/product_manufacturer/i18n/es.po b/addons/product_manufacturer/i18n/es.po
index 9bb9638aa56..7098bb186aa 100644
--- a/addons/product_manufacturer/i18n/es.po
+++ b/addons/product_manufacturer/i18n/es.po
@@ -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-09 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
diff --git a/addons/product_manufacturer/i18n/es_EC.po b/addons/product_manufacturer/i18n/es_EC.po
index 30957006528..67561365e0b 100644
--- a/addons/product_manufacturer/i18n/es_EC.po
+++ b/addons/product_manufacturer/i18n/es_EC.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-19 00:08+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-10-30 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
@@ -23,23 +23,16 @@ msgid "Manufacturer Product Code"
 msgstr ""
 
 #. module: product_manufacturer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la estructura de la vista!"
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "Producto"
 
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
 msgid "Product Template Name"
 msgstr "Nombre de plantilla de producto"
 
-#. module: product_manufacturer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con  x_ y no puede contener ningún "
-"carácter especial!"
-
 #. module: product_manufacturer
 #: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
 msgid "Product attributes"
@@ -56,17 +49,16 @@ msgstr ""
 msgid "Attribute"
 msgstr "Atributo"
 
-#. module: product_manufacturer
-#: model:ir.model,name:product_manufacturer.model_product_product
-#: field:product.manufacturer.attribute,product_id:0
-msgid "Product"
-msgstr "Producto"
-
 #. module: product_manufacturer
 #: field:product.manufacturer.attribute,value:0
 msgid "Value"
 msgstr "Valor"
 
+#. module: product_manufacturer
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: product_manufacturer
 #: view:product.product:0
 #: field:product.product,attribute_ids:0
diff --git a/addons/product_manufacturer/i18n/et.po b/addons/product_manufacturer/i18n/et.po
index 70d201e137d..40022b961d1 100644
--- a/addons/product_manufacturer/i18n/et.po
+++ b/addons/product_manufacturer/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-06-25 18:10+0000\n"
 "Last-Translator: lyyser <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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
@@ -23,22 +23,16 @@ msgid "Manufacturer Product Code"
 msgstr ""
 
 #. module: product_manufacturer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "Toode"
 
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
 msgid "Product Template Name"
 msgstr "Toote Malli nimi"
 
-#. module: product_manufacturer
-#: 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: product_manufacturer
 #: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
 msgid "Product attributes"
@@ -55,17 +49,16 @@ msgstr ""
 msgid "Attribute"
 msgstr "Atribuut"
 
-#. module: product_manufacturer
-#: model:ir.model,name:product_manufacturer.model_product_product
-#: field:product.manufacturer.attribute,product_id:0
-msgid "Product"
-msgstr "Toode"
-
 #. module: product_manufacturer
 #: field:product.manufacturer.attribute,value:0
 msgid "Value"
 msgstr "Väärtus"
 
+#. module: product_manufacturer
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: product_manufacturer
 #: view:product.product:0
 #: field:product.product,attribute_ids:0
diff --git a/addons/product_manufacturer/i18n/fr.po b/addons/product_manufacturer/i18n/fr.po
index e82b59f8dde..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-05 04:52+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/hr.po b/addons/product_manufacturer/i18n/hr.po
index 753f0359426..f797a0a495a 100644
--- a/addons/product_manufacturer/i18n/hr.po
+++ b/addons/product_manufacturer/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-10 08:27+0000\n"
 "Last-Translator: Dejan Radočaj <Unknown>\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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
@@ -23,22 +23,16 @@ msgid "Manufacturer Product Code"
 msgstr "Proizvođačka šifra artikla"
 
 #. module: product_manufacturer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za arhitekturu View-a!"
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "Proizvod"
 
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
 msgid "Product Template Name"
 msgstr "Naziv predloška proizvoda"
 
-#. module: product_manufacturer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove !"
-
 #. module: product_manufacturer
 #: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
 msgid "Product attributes"
@@ -55,17 +49,16 @@ msgstr "Značajke proizvoda"
 msgid "Attribute"
 msgstr "Značajka"
 
-#. module: product_manufacturer
-#: model:ir.model,name:product_manufacturer.model_product_product
-#: field:product.manufacturer.attribute,product_id:0
-msgid "Product"
-msgstr "Proizvod"
-
 #. module: product_manufacturer
 #: field:product.manufacturer.attribute,value:0
 msgid "Value"
 msgstr "Vrijednost"
 
+#. module: product_manufacturer
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: product_manufacturer
 #: view:product.product:0
 #: field:product.product,attribute_ids:0
diff --git a/addons/product_manufacturer/i18n/mn.po b/addons/product_manufacturer/i18n/mn.po
index 0f145ff235b..e5c8026a7c7 100644
--- a/addons/product_manufacturer/i18n/mn.po
+++ b/addons/product_manufacturer/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-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-12-02 02:55+0000\n"
 "Last-Translator: Jacara <Unknown>\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-12-03 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
@@ -23,28 +23,16 @@ msgid "Manufacturer Product Code"
 msgstr "Үйлдвэрлэгчийн барааны код"
 
 #. module: product_manufacturer
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: product_manufacturer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Дэлгэцийн XML алдаатай!"
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "Бараа"
 
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
 msgid "Product Template Name"
 msgstr "Барааны загварын нэр"
 
-#. module: product_manufacturer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-"болохгүй!"
-
 #. module: product_manufacturer
 #: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
 msgid "Product attributes"
@@ -61,26 +49,15 @@ msgstr "Барааны онцлогууд"
 msgid "Attribute"
 msgstr "Аттрибут"
 
-#. module: product_manufacturer
-#: model:ir.model,name:product_manufacturer.model_product_product
-#: field:product.manufacturer.attribute,product_id:0
-msgid "Product"
-msgstr "Бараа"
-
 #. module: product_manufacturer
 #: field:product.manufacturer.attribute,value:0
 msgid "Value"
 msgstr "Утга"
 
 #. module: product_manufacturer
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Модулийн нэр давхардах ёсгүй !"
-
-#. module: product_manufacturer
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Талбарын хэмжээ 1-с бага байж болохгүй !"
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
 
 #. module: product_manufacturer
 #: view:product.product:0
diff --git a/addons/product_manufacturer/i18n/pl.po b/addons/product_manufacturer/i18n/pl.po
index f32ba0a2520..61af23e46e2 100644
--- a/addons/product_manufacturer/i18n/pl.po
+++ b/addons/product_manufacturer/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-10-07 16:51+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
@@ -23,23 +23,16 @@ msgid "Manufacturer Product Code"
 msgstr "Kod producenta produktu"
 
 #. module: product_manufacturer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Niewłaściwy XML dla architektury widoku!"
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "Produkt"
 
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
 msgid "Product Template Name"
 msgstr "Nazwa szablonu produktu"
 
-#. module: product_manufacturer
-#: 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: product_manufacturer
 #: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
 msgid "Product attributes"
@@ -56,17 +49,16 @@ msgstr "Atrybuty produktu"
 msgid "Attribute"
 msgstr "Atrybut"
 
-#. module: product_manufacturer
-#: model:ir.model,name:product_manufacturer.model_product_product
-#: field:product.manufacturer.attribute,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
 #. module: product_manufacturer
 #: field:product.manufacturer.attribute,value:0
 msgid "Value"
 msgstr "Wartość"
 
+#. module: product_manufacturer
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: product_manufacturer
 #: view:product.product:0
 #: field:product.product,attribute_ids: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_manufacturer/i18n/pt.po b/addons/product_manufacturer/i18n/pt.po
index aeeff483419..26ea3569990 100644
--- a/addons/product_manufacturer/i18n/pt.po
+++ b/addons/product_manufacturer/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-04 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
diff --git a/addons/product_manufacturer/i18n/pt_BR.po b/addons/product_manufacturer/i18n/pt_BR.po
index cd7914ae5db..764dbb598b0 100644
--- a/addons/product_manufacturer/i18n/pt_BR.po
+++ b/addons/product_manufacturer/i18n/pt_BR.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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
diff --git a/addons/product_manufacturer/i18n/ru.po b/addons/product_manufacturer/i18n/ru.po
index 0f6c22888b9..f226d58127a 100644
--- a/addons/product_manufacturer/i18n/ru.po
+++ b/addons/product_manufacturer/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-07-10 20:09+0000\n"
 "Last-Translator: Pomazan Bogdan <Unknown>\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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
@@ -23,23 +23,16 @@ msgid "Manufacturer Product Code"
 msgstr ""
 
 #. module: product_manufacturer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра структуры!"
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "Продукция"
 
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
 msgid "Product Template Name"
 msgstr ""
 
-#. module: product_manufacturer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
 #. module: product_manufacturer
 #: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
 msgid "Product attributes"
@@ -56,17 +49,16 @@ msgstr ""
 msgid "Attribute"
 msgstr "Атрибут"
 
-#. module: product_manufacturer
-#: model:ir.model,name:product_manufacturer.model_product_product
-#: field:product.manufacturer.attribute,product_id:0
-msgid "Product"
-msgstr "Продукция"
-
 #. module: product_manufacturer
 #: field:product.manufacturer.attribute,value:0
 msgid "Value"
 msgstr "Значение"
 
+#. module: product_manufacturer
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: product_manufacturer
 #: view:product.product:0
 #: field:product.product,attribute_ids:0
diff --git a/addons/product_manufacturer/i18n/sl.po b/addons/product_manufacturer/i18n/sl.po
index a643866e739..4ed753fc95c 100644
--- a/addons/product_manufacturer/i18n/sl.po
+++ b/addons/product_manufacturer/i18n/sl.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-07-28 12:29+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-10-30 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
@@ -23,22 +23,16 @@ msgid "Manufacturer Product Code"
 msgstr ""
 
 #. module: product_manufacturer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda!"
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "Proizvod"
 
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
 msgid "Product Template Name"
 msgstr ""
 
-#. module: product_manufacturer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
-
 #. module: product_manufacturer
 #: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
 msgid "Product attributes"
@@ -55,17 +49,16 @@ msgstr ""
 msgid "Attribute"
 msgstr "Lastnost"
 
-#. module: product_manufacturer
-#: model:ir.model,name:product_manufacturer.model_product_product
-#: field:product.manufacturer.attribute,product_id:0
-msgid "Product"
-msgstr "Proizvod"
-
 #. module: product_manufacturer
 #: field:product.manufacturer.attribute,value:0
 msgid "Value"
 msgstr "Vrednost"
 
+#. module: product_manufacturer
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: product_manufacturer
 #: view:product.product:0
 #: field:product.product,attribute_ids:0
diff --git a/addons/product_manufacturer/i18n/sr.po b/addons/product_manufacturer/i18n/sr.po
index 54c5e81f9f4..1e7f2684077 100644
--- a/addons/product_manufacturer/i18n/sr.po
+++ b/addons/product_manufacturer/i18n/sr.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-10-14 16:37+0000\n"
 "Last-Translator: zmmaj <Unknown>\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-10-30 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
@@ -23,22 +23,16 @@ msgid "Manufacturer Product Code"
 msgstr "Proizvođačka šifra artikla"
 
 #. module: product_manufacturer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za pregled arhitekture"
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "Proizvod"
 
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
 msgid "Product Template Name"
 msgstr "Naziv predloška proizvoda"
 
-#. module: product_manufacturer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
 #. module: product_manufacturer
 #: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
 msgid "Product attributes"
@@ -55,17 +49,16 @@ msgstr "Atributi Proizvoda"
 msgid "Attribute"
 msgstr "Atribut"
 
-#. module: product_manufacturer
-#: model:ir.model,name:product_manufacturer.model_product_product
-#: field:product.manufacturer.attribute,product_id:0
-msgid "Product"
-msgstr "Proizvod"
-
 #. module: product_manufacturer
 #: field:product.manufacturer.attribute,value:0
 msgid "Value"
 msgstr "Vrednost"
 
+#. module: product_manufacturer
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: product_manufacturer
 #: view:product.product:0
 #: field:product.product,attribute_ids:0
diff --git a/addons/product_manufacturer/i18n/sr@latin.po b/addons/product_manufacturer/i18n/sr@latin.po
index 7677fede648..e7ba9dd1c79 100644
--- a/addons/product_manufacturer/i18n/sr@latin.po
+++ b/addons/product_manufacturer/i18n/sr@latin.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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
diff --git a/addons/product_manufacturer/i18n/sv.po b/addons/product_manufacturer/i18n/sv.po
index 0076813a7d0..735d5391208 100644
--- a/addons/product_manufacturer/i18n/sv.po
+++ b/addons/product_manufacturer/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-14 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
diff --git a/addons/product_manufacturer/i18n/zh_CN.po b/addons/product_manufacturer/i18n/zh_CN.po
index 3c69cc73860..ae7e21ff29b 100644
--- a/addons/product_manufacturer/i18n/zh_CN.po
+++ b/addons/product_manufacturer/i18n/zh_CN.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-09 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
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 969c0f2390e..61137a5e51e 100644
--- a/addons/product_margin/wizard/product_margin.py
+++ b/addons/product_margin/wizard/product_margin.py
@@ -53,7 +53,7 @@ class product_margin(osv.osv_memory):
             context = {}
         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'))
@@ -62,7 +62,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]
 
         context = {'invoice_state' : product_margin_obj.invoice_state}
         if product_margin_obj.from_date:
diff --git a/addons/product_visible_discount/i18n/ca.po b/addons/product_visible_discount/i18n/ca.po
index 966835ceab8..9050e172e13 100644
--- a/addons/product_visible_discount/i18n/ca.po
+++ b/addons/product_visible_discount/i18n/ca.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-06-21 15:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@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-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_visible_discount
@@ -23,23 +23,12 @@ msgstr ""
 msgid "No Purchase Pricelist Found !"
 msgstr ""
 
-#. module: product_visible_discount
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML no vàlid per a la definició de la vista!"
-
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:0
 #, python-format
 msgid "No Sale Pricelist Found "
 msgstr ""
 
-#. module: product_visible_discount
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: product_visible_discount
 #: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
 #: field:product.pricelist,visible_discount:0
@@ -72,3 +61,6 @@ msgstr ""
 #: model:ir.model,name:product_visible_discount.model_sale_order_line
 msgid "Sale Order Line"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML no vàlid per a la definició de la vista!"
diff --git a/addons/product_visible_discount/i18n/de.po b/addons/product_visible_discount/i18n/de.po
index 74d23180f47..994a8910dd4 100644
--- a/addons/product_visible_discount/i18n/de.po
+++ b/addons/product_visible_discount/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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-12-01 09:32+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,39 +15,21 @@ 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-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: product_visible_discount
-#: 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 !"
-
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:0
 #, python-format
 msgid "No Purchase Pricelist Found !"
 msgstr "Keine Einkaufspreisliste gefunden !"
 
-#. module: product_visible_discount
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter XML-Code für diese Ansicht!"
-
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:0
 #, python-format
 msgid "No Sale Pricelist Found "
 msgstr "Keine Verkaufspreisliste gefunden ! "
 
-#. module: product_visible_discount
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
-"Sonderzeichen haben !"
-
 #. module: product_visible_discount
 #: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
 #: field:product.pricelist,visible_discount:0
@@ -60,14 +42,10 @@ msgid "Invoice Line"
 msgstr "Rechnungsposition"
 
 #. module: product_visible_discount
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#. module: product_visible_discount
-#: 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 !"
+#: code:addons/product_visible_discount/product_visible_discount.py:0
+#, python-format
+msgid "You must first define a pricelist for Customer !"
+msgstr "Sie müssen zuerst eine Preisliste für den Kunden hinterlegen!"
 
 #. module: product_visible_discount
 #: model:ir.model,name:product_visible_discount.model_product_pricelist
@@ -85,8 +63,20 @@ msgstr "Sie müssen zuerst eine Preisliste für den Lieferanten hinterlegen!"
 msgid "Sale Order Line"
 msgstr "Verkaufsauftragsposition"
 
-#. module: product_visible_discount
-#: code:addons/product_visible_discount/product_visible_discount.py:0
-#, python-format
-msgid "You must first define a pricelist for Customer !"
-msgstr "Sie müssen zuerst eine Preisliste für den Kunden hinterlegen!"
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter XML-Code für diese Ansicht!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
+#~ "Sonderzeichen haben !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/product_visible_discount/i18n/el.po b/addons/product_visible_discount/i18n/el.po
index d64f7991e09..6c8127ee835 100644
--- a/addons/product_visible_discount/i18n/el.po
+++ b/addons/product_visible_discount/i18n/el.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-12 09:32+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-11-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_visible_discount
@@ -23,25 +23,12 @@ msgstr ""
 msgid "No Purchase Pricelist Found !"
 msgstr "Δεν υπάρχει Τιμοκατάλογος Αγοράς!"
 
-#. module: product_visible_discount
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Λανθασμένο XML για προβολή Αρχιτεκτονικής"
-
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:0
 #, python-format
 msgid "No Sale Pricelist Found "
 msgstr "Δεν βρέθηκε Τιμοκατάλογος Πώλησης "
 
-#. module: product_visible_discount
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Το όνομα του Αντικειμένου θα πρέπει να ξεκινά με x_ και να μην περιέχει "
-"ειδικούς χαρακτήρες"
-
 #. module: product_visible_discount
 #: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
 #: field:product.pricelist,visible_discount:0
@@ -74,3 +61,12 @@ msgstr "Θα πρέπει πρώτα να ορίσεις τιμοκατάλογ
 #: model:ir.model,name:product_visible_discount.model_sale_order_line
 msgid "Sale Order Line"
 msgstr "Γραμμή Παραγγελίας Πώλησης"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Λανθασμένο XML για προβολή Αρχιτεκτονικής"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Το όνομα του Αντικειμένου θα πρέπει να ξεκινά με x_ και να μην περιέχει "
+#~ "ειδικούς χαρακτήρες"
diff --git a/addons/product_visible_discount/i18n/es.po b/addons/product_visible_discount/i18n/es.po
index 7810c7c40e4..5b0cb4c0c4b 100644
--- a/addons/product_visible_discount/i18n/es.po
+++ b/addons/product_visible_discount/i18n/es.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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-23 09:42+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -15,39 +15,21 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: product_visible_discount
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:0
 #, python-format
 msgid "No Purchase Pricelist Found !"
 msgstr "¡No se ha encontrado tarifa de compra!"
 
-#. module: product_visible_discount
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la definición de la vista!"
-
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:0
 #, python-format
 msgid "No Sale Pricelist Found "
 msgstr "No se ha encontrado tarifa de venta "
 
-#. module: product_visible_discount
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: product_visible_discount
 #: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
 #: field:product.pricelist,visible_discount:0
@@ -60,14 +42,10 @@ msgid "Invoice Line"
 msgstr "Línea factura"
 
 #. module: product_visible_discount
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
-#. module: product_visible_discount
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#: code:addons/product_visible_discount/product_visible_discount.py:0
+#, python-format
+msgid "You must first define a pricelist for Customer !"
+msgstr "¡Primero debe definir una tarifa para el cliente!"
 
 #. module: product_visible_discount
 #: model:ir.model,name:product_visible_discount.model_product_pricelist
@@ -85,11 +63,8 @@ msgstr "¡Primero debe definir una tarifa para el proveedor!"
 msgid "Sale Order Line"
 msgstr "Línea pedido venta"
 
-#. module: product_visible_discount
-#: code:addons/product_visible_discount/product_visible_discount.py:0
-#, python-format
-msgid "You must first define a pricelist for Customer !"
-msgstr "¡Primero debe definir una tarifa para el cliente!"
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la definición de la vista!"
 
 #~ msgid ""
 #~ "\n"
@@ -121,3 +96,18 @@ msgstr "¡Primero debe definir una tarifa para el cliente!"
 #~ "y en la factura aparecerá: Precio unitario=225, Descuento=0,00, Precio "
 #~ "neto=225\n"
 #~ "    "
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/product_visible_discount/i18n/es_EC.po b/addons/product_visible_discount/i18n/es_EC.po
index 6fc1d05fef4..f69e41c5800 100644
--- a/addons/product_visible_discount/i18n/es_EC.po
+++ b/addons/product_visible_discount/i18n/es_EC.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-19 00:08+0000\n"
-"Last-Translator: Cristian Salamea (GnuThink) <ovnicraft@gmail.com>\n"
+"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_visible_discount
@@ -23,23 +23,12 @@ msgstr ""
 msgid "No Purchase Pricelist Found !"
 msgstr ""
 
-#. module: product_visible_discount
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la definición de la vista!"
-
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:0
 #, python-format
 msgid "No Sale Pricelist Found "
 msgstr ""
 
-#. module: product_visible_discount
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: product_visible_discount
 #: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
 #: field:product.pricelist,visible_discount:0
diff --git a/addons/product_visible_discount/i18n/et.po b/addons/product_visible_discount/i18n/et.po
index 8338f351e75..00a873027e3 100644
--- a/addons/product_visible_discount/i18n/et.po
+++ b/addons/product_visible_discount/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-07-08 08:45+0000\n"
 "Last-Translator: lyyser <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-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_visible_discount
@@ -23,23 +23,12 @@ msgstr ""
 msgid "No Purchase Pricelist Found !"
 msgstr ""
 
-#. module: product_visible_discount
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:0
 #, python-format
 msgid "No Sale Pricelist Found "
 msgstr ""
 
-#. module: product_visible_discount
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: product_visible_discount
 #: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
 #: field:product.pricelist,visible_discount:0
@@ -72,3 +61,6 @@ msgstr ""
 #: model:ir.model,name:product_visible_discount.model_sale_order_line
 msgid "Sale Order Line"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Vigane XML vaate arhitektuurile!"
diff --git a/addons/product_visible_discount/i18n/fr.po b/addons/product_visible_discount/i18n/fr.po
index 6321c887e71..c0322e1b243 100644
--- a/addons/product_visible_discount/i18n/fr.po
+++ b/addons/product_visible_discount/i18n/fr.po
@@ -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-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_visible_discount
diff --git a/addons/product_visible_discount/i18n/hr.po b/addons/product_visible_discount/i18n/hr.po
index d3d674fa611..8abe3680049 100644
--- a/addons/product_visible_discount/i18n/hr.po
+++ b/addons/product_visible_discount/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-29 10:53+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_visible_discount
@@ -23,23 +23,12 @@ msgstr ""
 msgid "No Purchase Pricelist Found !"
 msgstr ""
 
-#. module: product_visible_discount
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neispravan XML za arhitekturu View-a"
-
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:0
 #, python-format
 msgid "No Sale Pricelist Found "
 msgstr ""
 
-#. module: product_visible_discount
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: product_visible_discount
 #: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
 #: field:product.pricelist,visible_discount:0
@@ -73,6 +62,9 @@ msgstr ""
 msgid "Sale Order Line"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neispravan XML za arhitekturu View-a"
+
 #~ msgid ""
 #~ "\n"
 #~ "    This module lets you calculate discounts on Sale Order lines and Invoice "
diff --git a/addons/product_visible_discount/i18n/it.po b/addons/product_visible_discount/i18n/it.po
index fb222f2d3ce..03afb985381 100644
--- a/addons/product_visible_discount/i18n/it.po
+++ b/addons/product_visible_discount/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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-18 07:07+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <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-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_visible_discount
@@ -23,23 +23,12 @@ msgstr ""
 msgid "No Purchase Pricelist Found !"
 msgstr ""
 
-#. module: product_visible_discount
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per visualizzare l'Achitettura!"
-
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:0
 #, python-format
 msgid "No Sale Pricelist Found "
 msgstr ""
 
-#. module: product_visible_discount
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: product_visible_discount
 #: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
 #: field:product.pricelist,visible_discount:0
@@ -73,6 +62,9 @@ msgstr ""
 msgid "Sale Order Line"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per visualizzare l'Achitettura!"
+
 #~ msgid ""
 #~ "\n"
 #~ "    This module lets you calculate discounts on Sale Order lines and Invoice "
diff --git a/addons/product_visible_discount/i18n/mn.po b/addons/product_visible_discount/i18n/mn.po
index 167a3d44004..d43b5006938 100644
--- a/addons/product_visible_discount/i18n/mn.po
+++ b/addons/product_visible_discount/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-12 06:37+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-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_visible_discount
@@ -23,23 +23,12 @@ msgstr ""
 msgid "No Purchase Pricelist Found !"
 msgstr ""
 
-#. module: product_visible_discount
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Дэлгэцийн XML алдаатай!"
-
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:0
 #, python-format
 msgid "No Sale Pricelist Found "
 msgstr ""
 
-#. module: product_visible_discount
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: product_visible_discount
 #: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
 #: field:product.pricelist,visible_discount:0
@@ -73,6 +62,9 @@ msgstr ""
 msgid "Sale Order Line"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Дэлгэцийн XML алдаатай!"
+
 #~ msgid ""
 #~ "\n"
 #~ "    This module lets you calculate discounts on Sale Order lines and Invoice "
diff --git a/addons/product_visible_discount/i18n/pl.po b/addons/product_visible_discount/i18n/pl.po
index 2dbc48281cd..9060b84941e 100644
--- a/addons/product_visible_discount/i18n/pl.po
+++ b/addons/product_visible_discount/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-07-26 14:58+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_visible_discount
@@ -23,23 +23,12 @@ msgstr ""
 msgid "No Purchase Pricelist Found !"
 msgstr ""
 
-#. module: product_visible_discount
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Niewłaściwy XML dla architektury widoku!"
-
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:0
 #, python-format
 msgid "No Sale Pricelist Found "
 msgstr ""
 
-#. module: product_visible_discount
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: product_visible_discount
 #: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
 #: field:product.pricelist,visible_discount:0
@@ -73,6 +62,9 @@ msgstr ""
 msgid "Sale Order Line"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Niewłaściwy XML dla architektury widoku!"
+
 #~ msgid ""
 #~ "\n"
 #~ "    This module lets you calculate discounts on Sale Order lines and Invoice "
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/i18n/pt.po b/addons/product_visible_discount/i18n/pt.po
index ee679978884..1ee514cf68e 100644
--- a/addons/product_visible_discount/i18n/pt.po
+++ b/addons/product_visible_discount/i18n/pt.po
@@ -7,46 +7,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-27 04:42+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-11-28 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: product_visible_discount
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "O ID do certificado do módulo tem de ser único!"
-
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:0
 #, python-format
 msgid "No Purchase Pricelist Found !"
 msgstr "Não foi encontrado um preçário para compras"
 
-#. module: product_visible_discount
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML Inválido para a Arquitectura de Vista!"
-
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:0
 #, python-format
 msgid "No Sale Pricelist Found "
 msgstr "Não foi encontrado um preçário para vendas "
 
-#. module: product_visible_discount
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
-"especial !"
-
 #. module: product_visible_discount
 #: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
 #: field:product.pricelist,visible_discount:0
@@ -59,14 +41,10 @@ msgid "Invoice Line"
 msgstr "Linha de Factura"
 
 #. module: product_visible_discount
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo deve ser único!"
-
-#. module: product_visible_discount
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "O tamanho do campo não pode ser inferior a 1 !"
+#: code:addons/product_visible_discount/product_visible_discount.py:0
+#, python-format
+msgid "You must first define a pricelist for Customer !"
+msgstr "Primeiro, deverá definir um preçário para o cliente !"
 
 #. module: product_visible_discount
 #: model:ir.model,name:product_visible_discount.model_product_pricelist
@@ -84,8 +62,20 @@ msgstr "Primeiro, deverá definir um preçário para o fornecedor"
 msgid "Sale Order Line"
 msgstr "Linha de Ordem de venda"
 
-#. module: product_visible_discount
-#: code:addons/product_visible_discount/product_visible_discount.py:0
-#, python-format
-msgid "You must first define a pricelist for Customer !"
-msgstr "Primeiro, deverá definir um preçário para o cliente !"
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML Inválido para a Arquitectura de Vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
+#~ "especial !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID do certificado do módulo tem de ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "O nome do módulo deve ser único!"
diff --git a/addons/product_visible_discount/i18n/ru.po b/addons/product_visible_discount/i18n/ru.po
index 931ad94f353..5985f1ab5fa 100644
--- a/addons/product_visible_discount/i18n/ru.po
+++ b/addons/product_visible_discount/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-07 07:48+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-11-08 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_visible_discount
@@ -23,25 +23,12 @@ msgstr ""
 msgid "No Purchase Pricelist Found !"
 msgstr "Не найден каталог для закупок !"
 
-#. module: product_visible_discount
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра структуры!"
-
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:0
 #, python-format
 msgid "No Sale Pricelist Found "
 msgstr "Не найден каталог для продаж "
 
-#. module: product_visible_discount
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_ и не должно содержать специальных "
-"символов !"
-
 #. module: product_visible_discount
 #: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
 #: field:product.pricelist,visible_discount:0
@@ -74,3 +61,12 @@ msgstr "Сначала вы должны определить каталог д
 #: model:ir.model,name:product_visible_discount.model_sale_order_line
 msgid "Sale Order Line"
 msgstr "Позиция заказа на продажу"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра структуры!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_ и не должно содержать специальных "
+#~ "символов !"
diff --git a/addons/product_visible_discount/i18n/sl.po b/addons/product_visible_discount/i18n/sl.po
index 9d52541f319..765950943fb 100644
--- a/addons/product_visible_discount/i18n/sl.po
+++ b/addons/product_visible_discount/i18n/sl.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-07-02 12:04+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-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_visible_discount
@@ -23,23 +23,12 @@ msgstr ""
 msgid "No Purchase Pricelist Found !"
 msgstr ""
 
-#. module: product_visible_discount
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda!"
-
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:0
 #, python-format
 msgid "No Sale Pricelist Found "
 msgstr ""
 
-#. module: product_visible_discount
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: product_visible_discount
 #: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
 #: field:product.pricelist,visible_discount:0
@@ -72,3 +61,6 @@ msgstr ""
 #: model:ir.model,name:product_visible_discount.model_sale_order_line
 msgid "Sale Order Line"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda!"
diff --git a/addons/product_visible_discount/i18n/sr.po b/addons/product_visible_discount/i18n/sr.po
index 9e9a4c9b902..668f3c6524d 100644
--- a/addons/product_visible_discount/i18n/sr.po
+++ b/addons/product_visible_discount/i18n/sr.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-04 09:02+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-06 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_visible_discount
@@ -23,24 +23,12 @@ msgstr ""
 msgid "No Purchase Pricelist Found !"
 msgstr "Nije pronadjen Nabavni Cenovnik !"
 
-#. module: product_visible_discount
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za pregled arhitekture"
-
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:0
 #, python-format
 msgid "No Sale Pricelist Found "
 msgstr "Nije pronadjen Prodajni Cenovnik ! "
 
-#. module: product_visible_discount
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere."
-
 #. module: product_visible_discount
 #: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
 #: field:product.pricelist,visible_discount:0
@@ -74,6 +62,9 @@ msgstr "Prvo moras definisati Cenovnik za Dobavljace !"
 msgid "Sale Order Line"
 msgstr "Linija Prodajnih Naloga"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nevažeći XML za pregled arhitekture"
+
 #~ msgid ""
 #~ "\n"
 #~ "    This module lets you calculate discounts on Sale Order lines and Invoice "
@@ -101,3 +92,8 @@ msgstr "Linija Prodajnih Naloga"
 #~ "Ako kućica nije označena, na stavkama računa i fakture će pisati: Cena=225, "
 #~ "Popust=0,00, Neto cena=225\n"
 #~ "    "
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere."
diff --git a/addons/product_visible_discount/i18n/sr@latin.po b/addons/product_visible_discount/i18n/sr@latin.po
index b7edd5b1533..30d0aab664c 100644
--- a/addons/product_visible_discount/i18n/sr@latin.po
+++ b/addons/product_visible_discount/i18n/sr@latin.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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_visible_discount
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/de.po b/addons/profile_tools/i18n/de.po
index 17bd9085693..e174b85c874 100644
--- a/addons/profile_tools/i18n/de.po
+++ b/addons/profile_tools/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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-12-01 07:22+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,22 +15,19 @@ 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:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: profile_tools
+#: field:misc_tools.installer,idea:0
+msgid "Ideas Box"
+msgstr "Betriebliche Vorschläge"
+
 #. module: profile_tools
 #: help:misc_tools.installer,idea:0
 msgid "Promote ideas of the employees, votes and discussion on best ideas."
 msgstr "Abstimmung über Mitarbeitervorschläge"
 
-#. module: profile_tools
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
-"Sonderzeichen haben !"
-
 #. module: profile_tools
 #: help:misc_tools.installer,share:0
 msgid ""
@@ -43,61 +40,35 @@ msgstr ""
 "Finanzbuchhalter. Sie können jegliches OpenERP Menü, wie z.B. Aufgaben, "
 "Kundendienst, Rechnungen etc. freigeben"
 
+#. module: profile_tools
+#: help:misc_tools.installer,subscription:0
+msgid "Helps to generate automatically recurring documents."
+msgstr "Hilft bei der Erstellung autom. wiederkehrender Dokumente"
+
+#. module: profile_tools
+#: field:misc_tools.installer,lunch:0
+msgid "Lunch"
+msgstr "Mittagessen"
+
 #. module: profile_tools
 #: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
 msgid "Tools Configuration"
 msgstr "Konfiguration Werkzeuge"
 
 #. module: profile_tools
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
+#: field:misc_tools.installer,config_logo:0
+msgid "Image"
+msgstr "Bild"
 
 #. module: profile_tools
-#: model:ir.model,name:profile_tools.model_misc_tools_installer
-msgid "misc_tools.installer"
+#: view:misc_tools.installer:0
+msgid "title"
 msgstr ""
 
 #. module: profile_tools
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#. module: profile_tools
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#. 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 ""
-"Installationstool für die Module lunch, \n"
-" survey,subscription and audittrail\n"
-"    "
-
-#. module: profile_tools
-#: 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 !"
-
-#. module: profile_tools
-#: field:misc_tools.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Abfolge Konfiguration"
-
-#. module: profile_tools
-#: help:misc_tools.installer,survey:0
-msgid "Allows you to organize surveys."
-msgstr "Ermöglicht Umfragen."
-
-#. module: profile_tools
-#: model:ir.module.module,shortdesc:profile_tools.module_meta_information
-msgid "Miscellaneous Tools"
-msgstr "Sonstige Werkzeuge"
+#: field:misc_tools.installer,subscription:0
+msgid "Recurring Documents"
+msgstr "Wiederkehrende Dokumente"
 
 #. module: profile_tools
 #: help:misc_tools.installer,pad:0
@@ -111,24 +82,9 @@ msgstr ""
 "miteinander vernetzen."
 
 #. module: profile_tools
-#: field:misc_tools.installer,lunch:0
-msgid "Lunch"
-msgstr "Mittagessen"
-
-#. module: profile_tools
-#: field:misc_tools.installer,idea:0
-msgid "Ideas Box"
-msgstr "Betriebliche Vorschläge"
-
-#. module: profile_tools
-#: help:misc_tools.installer,subscription:0
-msgid "Helps to generate automatically recurring documents."
-msgstr "Hilft bei der Erstellung autom. wiederkehrender Dokumente"
-
-#. module: profile_tools
-#: field:misc_tools.installer,subscription:0
-msgid "Recurring Documents"
-msgstr "Wiederkehrende Dokumente"
+#: help:misc_tools.installer,survey:0
+msgid "Allows you to organize surveys."
+msgstr "Ermöglicht Umfragen."
 
 #. module: profile_tools
 #: field:misc_tools.installer,survey:0
@@ -136,33 +92,56 @@ msgid "Survey"
 msgstr "Umfrage"
 
 #. module: profile_tools
-#: field:misc_tools.installer,config_logo:0
-msgid "Image"
-msgstr "Bild"
-
-#. module: profile_tools
-#: view:misc_tools.installer:0
-msgid "title"
+#: model:ir.model,name:profile_tools.model_misc_tools_installer
+msgid "misc_tools.installer"
 msgstr ""
 
-#. module: profile_tools
-#: field:misc_tools.installer,share:0
-msgid "Web Share"
-msgstr "Gemeinsames Web"
-
 #. module: profile_tools
 #: field:misc_tools.installer,pad:0
 msgid "Native pad integration"
 msgstr "Generische Padintegration"
 
 #. module: profile_tools
-#: 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 !"
+#: field:misc_tools.installer,share:0
+msgid "Web Share"
+msgstr "Gemeinsames Web"
+
+#. module: profile_tools
+#: model:ir.module.module,shortdesc:profile_tools.module_meta_information
+msgid "Miscellaneous Tools"
+msgstr "Sonstige Werkzeuge"
+
+#. 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 ""
+"Installationstool für die Module lunch, \n"
+" survey,subscription and audittrail\n"
+"    "
+
+#. module: profile_tools
+#: field:misc_tools.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Abfolge Konfiguration"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
+#~ "Sonderzeichen haben !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
 
 #~ msgid "Share Data / Portals"
 #~ msgstr "Freigabe von Daten / Portal"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
 #~ msgid ""
 #~ "This module allows you to easily give restricted access of any filtered list "
 #~ "of objects to any customer or supplier.Just click on the share icon to give "
@@ -173,3 +152,12 @@ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
 #~ "Listen oder Objekte für bestimmte Kunden oder Lieferanten oder sonstige "
 #~ "Externe. Sie brauchen hierzu nur auf den Freigabe Button drücken, um "
 #~ "Freigaben zu Aufgaben, Supporttickets, Rechnungen etc. zu erteilen."
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ 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 certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/profile_tools/i18n/es.po b/addons/profile_tools/i18n/es.po
index 7f4d4f65043..4fcdd42c242 100644
--- a/addons/profile_tools/i18n/es.po
+++ b/addons/profile_tools/i18n/es.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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-29 07:42+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -15,9 +15,14 @@ msgstr ""
 "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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: profile_tools
+#: field:misc_tools.installer,idea:0
+msgid "Ideas Box"
+msgstr "Caja de ideas"
+
 #. module: profile_tools
 #: help:misc_tools.installer,idea:0
 msgid "Promote ideas of the employees, votes and discussion on best ideas."
@@ -25,14 +30,6 @@ msgstr ""
 "Promueve las ideas de los empleados, y la votación y el debate de las "
 "mejores ideas."
 
-#. module: profile_tools
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: profile_tools
 #: help:misc_tools.installer,share:0
 msgid ""
@@ -45,61 +42,35 @@ msgstr ""
 "cualquier menú OpenERP como las tareas del proyecto, las solicitudes de "
 "apoyo, facturas, etc"
 
+#. module: profile_tools
+#: help:misc_tools.installer,subscription:0
+msgid "Helps to generate automatically recurring documents."
+msgstr "Ayuda a generar documentos recurrentes automáticamente."
+
+#. module: profile_tools
+#: field:misc_tools.installer,lunch:0
+msgid "Lunch"
+msgstr "Comida"
+
 #. module: profile_tools
 #: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
 msgid "Tools Configuration"
 msgstr "Configuración de herramientas"
 
 #. module: profile_tools
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la estructura de la vista!"
+#: field:misc_tools.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
 
 #. module: profile_tools
-#: model:ir.model,name:profile_tools.model_misc_tools_installer
-msgid "misc_tools.installer"
-msgstr "herramientas_varias.instalador"
+#: view:misc_tools.installer:0
+msgid "title"
+msgstr "título"
 
 #. module: profile_tools
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
-#. module: profile_tools
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
-#. 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 ""
-"Instala herramientas para comida, encuesta, suscripción y auditoría\n"
-"    módulo\n"
-"    "
-
-#. module: profile_tools
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#. module: profile_tools
-#: field:misc_tools.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso configuración"
-
-#. module: profile_tools
-#: help:misc_tools.installer,survey:0
-msgid "Allows you to organize surveys."
-msgstr "Le permite organizar encuestas"
-
-#. module: profile_tools
-#: model:ir.module.module,shortdesc:profile_tools.module_meta_information
-msgid "Miscellaneous Tools"
-msgstr "Herramientas varias"
+#: field:misc_tools.installer,subscription:0
+msgid "Recurring Documents"
+msgstr "Documentos recurrentes"
 
 #. module: profile_tools
 #: help:misc_tools.installer,pad:0
@@ -113,24 +84,9 @@ msgstr ""
 "pads a los objetos de OpenERP a través de archivos adjuntos OpenERP."
 
 #. module: profile_tools
-#: field:misc_tools.installer,lunch:0
-msgid "Lunch"
-msgstr "Comida"
-
-#. module: profile_tools
-#: field:misc_tools.installer,idea:0
-msgid "Ideas Box"
-msgstr "Caja de ideas"
-
-#. module: profile_tools
-#: help:misc_tools.installer,subscription:0
-msgid "Helps to generate automatically recurring documents."
-msgstr "Ayuda a generar documentos recurrentes automáticamente."
-
-#. module: profile_tools
-#: field:misc_tools.installer,subscription:0
-msgid "Recurring Documents"
-msgstr "Documentos recurrentes"
+#: help:misc_tools.installer,survey:0
+msgid "Allows you to organize surveys."
+msgstr "Le permite organizar encuestas"
 
 #. module: profile_tools
 #: field:misc_tools.installer,survey:0
@@ -138,19 +94,9 @@ msgid "Survey"
 msgstr "Encuesta"
 
 #. module: profile_tools
-#: field:misc_tools.installer,config_logo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: profile_tools
-#: view:misc_tools.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: profile_tools
-#: field:misc_tools.installer,share:0
-msgid "Web Share"
-msgstr "Compartir Web"
+#: model:ir.model,name:profile_tools.model_misc_tools_installer
+msgid "misc_tools.installer"
+msgstr "herramientas_varias.instalador"
 
 #. module: profile_tools
 #: field:misc_tools.installer,pad:0
@@ -158,9 +104,39 @@ msgid "Native pad integration"
 msgstr "Integración pad nativa"
 
 #. module: profile_tools
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#: field:misc_tools.installer,share:0
+msgid "Web Share"
+msgstr "Compartir Web"
+
+#. module: profile_tools
+#: model:ir.module.module,shortdesc:profile_tools.module_meta_information
+msgid "Miscellaneous Tools"
+msgstr "Herramientas varias"
+
+#. 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 ""
+"Instala herramientas para comida, encuesta, suscripción y auditoría\n"
+"    módulo\n"
+"    "
+
+#. module: profile_tools
+#: field:misc_tools.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
 
 #~ msgid ""
 #~ "This module allows you to easily give restricted access of any filtered list "
@@ -175,3 +151,15 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 
 #~ msgid "Share Data / Portals"
 #~ msgstr "Compartir datos / Portales"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura de la vista!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/profile_tools/i18n/fr.po b/addons/profile_tools/i18n/fr.po
index 465c1ae5011..38ffeafdfc0 100644
--- a/addons/profile_tools/i18n/fr.po
+++ b/addons/profile_tools/i18n/fr.po
@@ -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-05 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_tools
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/profile_tools/i18n/pt.po b/addons/profile_tools/i18n/pt.po
index 0d8779123e2..645b4ef9a5b 100644
--- a/addons/profile_tools/i18n/pt.po
+++ b/addons/profile_tools/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-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_tools
diff --git a/addons/project/i18n/fr.po b/addons/project/i18n/fr.po
index 42281cffd3a..459aab15a98 100644
--- a/addons/project/i18n/fr.po
+++ b/addons/project/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 16:41+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 03:18+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 04:56+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/de.po b/addons/project_caldav/i18n/de.po
index 964d2124922..06dad437c25 100644
--- a/addons/project_caldav/i18n/de.po
+++ b/addons/project_caldav/i18n/de.po
@@ -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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_caldav
diff --git a/addons/project_caldav/i18n/es.po b/addons/project_caldav/i18n/es.po
index 6962b5a813d..7174bf6d3aa 100644
--- a/addons/project_caldav/i18n/es.po
+++ b/addons/project_caldav/i18n/es.po
@@ -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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_caldav
diff --git a/addons/project_caldav/i18n/nl.po b/addons/project_caldav/i18n/nl.po
index a31ee1345b0..b7397bea8c3 100644
--- a/addons/project_caldav/i18n/nl.po
+++ b/addons/project_caldav/i18n/nl.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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_caldav
diff --git a/addons/project_caldav/i18n/pl.po b/addons/project_caldav/i18n/pl.po
index 7e0e2e96940..3b67f670a5e 100644
--- a/addons/project_caldav/i18n/pl.po
+++ b/addons/project_caldav/i18n/pl.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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_caldav
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/i18n/pt.po b/addons/project_caldav/i18n/pt.po
index 581d5dee8ce..feacc392888 100644
--- a/addons/project_caldav/i18n/pt.po
+++ b/addons/project_caldav/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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_caldav
diff --git a/addons/project_caldav/i18n/sv.po b/addons/project_caldav/i18n/sv.po
index 68f6dabe956..7fbb482c68f 100644
--- a/addons/project_caldav/i18n/sv.po
+++ b/addons/project_caldav/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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_caldav
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/ar.po b/addons/project_gtd/i18n/ar.po
index 99aab4f87fc..f2908cd1623 100644
--- a/addons/project_gtd/i18n/ar.po
+++ b/addons/project_gtd/i18n/ar.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/bg.po b/addons/project_gtd/i18n/bg.po
index 8d7b8fd29cf..8e2fb09b99d 100644
--- a/addons/project_gtd/i18n/bg.po
+++ b/addons/project_gtd/i18n/bg.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/bs.po b/addons/project_gtd/i18n/bs.po
index ba5796afbef..69c961de18f 100644
--- a/addons/project_gtd/i18n/bs.po
+++ b/addons/project_gtd/i18n/bs.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/ca.po b/addons/project_gtd/i18n/ca.po
index 5ee71c7ab55..e1e59e85cf9 100644
--- a/addons/project_gtd/i18n/ca.po
+++ b/addons/project_gtd/i18n/ca.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/cs.po b/addons/project_gtd/i18n/cs.po
index c1c6a3352db..e16dd12e7f0 100644
--- a/addons/project_gtd/i18n/cs.po
+++ b/addons/project_gtd/i18n/cs.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/de.po b/addons/project_gtd/i18n/de.po
index 49878aa0c91..eb94e352a2f 100644
--- a/addons/project_gtd/i18n/de.po
+++ b/addons/project_gtd/i18n/de.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/el.po b/addons/project_gtd/i18n/el.po
index 05951c526a6..31f3133920d 100644
--- a/addons/project_gtd/i18n/el.po
+++ b/addons/project_gtd/i18n/el.po
@@ -12,7 +12,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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/project_gtd/i18n/es.po b/addons/project_gtd/i18n/es.po
index ff1a13e71c9..fe17623757c 100644
--- a/addons/project_gtd/i18n/es.po
+++ b/addons/project_gtd/i18n/es.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/es_AR.po b/addons/project_gtd/i18n/es_AR.po
index 752e47d491d..feb012004af 100644
--- a/addons/project_gtd/i18n/es_AR.po
+++ b/addons/project_gtd/i18n/es_AR.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/es_EC.po b/addons/project_gtd/i18n/es_EC.po
index f3ac639e801..fb4ae845f98 100644
--- a/addons/project_gtd/i18n/es_EC.po
+++ b/addons/project_gtd/i18n/es_EC.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/et.po b/addons/project_gtd/i18n/et.po
index e4f0736e355..ad7fc6bd887 100644
--- a/addons/project_gtd/i18n/et.po
+++ b/addons/project_gtd/i18n/et.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/fi.po b/addons/project_gtd/i18n/fi.po
index 5a2c29bb866..7c8541549ce 100644
--- a/addons/project_gtd/i18n/fi.po
+++ b/addons/project_gtd/i18n/fi.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/fr.po b/addons/project_gtd/i18n/fr.po
index 3043ab7a68d..f8e34e98a2e 100644
--- a/addons/project_gtd/i18n/fr.po
+++ b/addons/project_gtd/i18n/fr.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/hr.po b/addons/project_gtd/i18n/hr.po
index ecf6b8cb77a..2a561a81d1b 100644
--- a/addons/project_gtd/i18n/hr.po
+++ b/addons/project_gtd/i18n/hr.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/project_gtd/i18n/hu.po b/addons/project_gtd/i18n/hu.po
index 99aab4f87fc..c57c0782bb9 100644
--- a/addons/project_gtd/i18n/hu.po
+++ b/addons/project_gtd/i18n/hu.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/id.po b/addons/project_gtd/i18n/id.po
index 47aa23d92f5..a4527e0e578 100644
--- a/addons/project_gtd/i18n/id.po
+++ b/addons/project_gtd/i18n/id.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/it.po b/addons/project_gtd/i18n/it.po
index 74c7215ab73..72685b4b2d8 100644
--- a/addons/project_gtd/i18n/it.po
+++ b/addons/project_gtd/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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/ko.po b/addons/project_gtd/i18n/ko.po
index f3d1f3060cd..8c340186c70 100644
--- a/addons/project_gtd/i18n/ko.po
+++ b/addons/project_gtd/i18n/ko.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/lt.po b/addons/project_gtd/i18n/lt.po
index 99aab4f87fc..c57c0782bb9 100644
--- a/addons/project_gtd/i18n/lt.po
+++ b/addons/project_gtd/i18n/lt.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/nl.po b/addons/project_gtd/i18n/nl.po
index 3816e0bbfee..c65fd021d85 100644
--- a/addons/project_gtd/i18n/nl.po
+++ b/addons/project_gtd/i18n/nl.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/nl_BE.po b/addons/project_gtd/i18n/nl_BE.po
index 4bb9c3d42ca..88935a10c55 100644
--- a/addons/project_gtd/i18n/nl_BE.po
+++ b/addons/project_gtd/i18n/nl_BE.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/pl.po b/addons/project_gtd/i18n/pl.po
index 74bb9d78b01..8a7fc4c2726 100644
--- a/addons/project_gtd/i18n/pl.po
+++ b/addons/project_gtd/i18n/pl.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
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 3df634f5e6d..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-14 05:24+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/i18n/pt_BR.po b/addons/project_gtd/i18n/pt_BR.po
index a5f375b5051..89752bd7f22 100644
--- a/addons/project_gtd/i18n/pt_BR.po
+++ b/addons/project_gtd/i18n/pt_BR.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/ro.po b/addons/project_gtd/i18n/ro.po
index 760d713ffdb..c57c0782bb9 100644
--- a/addons/project_gtd/i18n/ro.po
+++ b/addons/project_gtd/i18n/ro.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/ru.po b/addons/project_gtd/i18n/ru.po
index ad0f438de78..6fadca91acd 100644
--- a/addons/project_gtd/i18n/ru.po
+++ b/addons/project_gtd/i18n/ru.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/sl.po b/addons/project_gtd/i18n/sl.po
index fbd37574cc4..63c120e4caa 100644
--- a/addons/project_gtd/i18n/sl.po
+++ b/addons/project_gtd/i18n/sl.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/sq.po b/addons/project_gtd/i18n/sq.po
index 1311aed1313..fc38c7e5336 100644
--- a/addons/project_gtd/i18n/sq.po
+++ b/addons/project_gtd/i18n/sq.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-14 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/sv.po b/addons/project_gtd/i18n/sv.po
index b244d5adde0..e0b37eecb54 100644
--- a/addons/project_gtd/i18n/sv.po
+++ b/addons/project_gtd/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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/tlh.po b/addons/project_gtd/i18n/tlh.po
index fd2545420be..1ee9084467a 100644
--- a/addons/project_gtd/i18n/tlh.po
+++ b/addons/project_gtd/i18n/tlh.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/tr.po b/addons/project_gtd/i18n/tr.po
index cfa3f8d24ce..a05e650ef8c 100644
--- a/addons/project_gtd/i18n/tr.po
+++ b/addons/project_gtd/i18n/tr.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/uk.po b/addons/project_gtd/i18n/uk.po
index ad9842df9ad..3b4dbefa8b6 100644
--- a/addons/project_gtd/i18n/uk.po
+++ b/addons/project_gtd/i18n/uk.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/vi.po b/addons/project_gtd/i18n/vi.po
index ae62ebdfb9b..591326a5538 100644
--- a/addons/project_gtd/i18n/vi.po
+++ b/addons/project_gtd/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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/zh_CN.po b/addons/project_gtd/i18n/zh_CN.po
index 726aa83453b..0019cafaa91 100644
--- a/addons/project_gtd/i18n/zh_CN.po
+++ b/addons/project_gtd/i18n/zh_CN.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/zh_TW.po b/addons/project_gtd/i18n/zh_TW.po
index 30eb721d14e..102f4f0b11b 100644
--- a/addons/project_gtd/i18n/zh_TW.po
+++ b/addons/project_gtd/i18n/zh_TW.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-14 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:08+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/de.po b/addons/project_issue/i18n/de.po
index d03a3a54e67..3fe25a4014c 100644
--- a/addons/project_issue/i18n/de.po
+++ b/addons/project_issue/i18n/de.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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-28 11:40+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-29 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_issue
@@ -33,14 +33,9 @@ msgid "Working Hours to Open the Issue"
 msgstr "Arbeitszeit für Eröffnung"
 
 #. module: project_issue
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Fehlerhafte Modellbezeichnung für diese Aktion."
-
-#. module: project_issue
-#: view:project.issue:0
-msgid "Today"
-msgstr "Heute"
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
 
 #. module: project_issue
 #: field:project.issue,date_open:0
@@ -100,6 +95,11 @@ msgstr ""
 "Für das entsprechende Projekt wurde kein Projekt definiert, in das eskaliert "
 "werden kann !"
 
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Date Closed"
@@ -257,11 +257,9 @@ msgid "Convert To Task"
 msgstr "Erzeuge Aufgabe"
 
 #. module: project_issue
-#: field:project.issue,date_closed:0
-#: selection:project.issue,state:0
-#: selection:project.issue.report,state:0
-msgid "Closed"
-msgstr "Beendet"
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Wartung"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_project_issue_report
@@ -288,11 +286,6 @@ msgstr "Nächstes"
 msgid "Priority"
 msgstr "Priorität"
 
-#. module: project_issue
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Send New Email"
@@ -359,6 +352,11 @@ msgstr "Telefon"
 msgid "Reset to Draft"
 msgstr "Zurücksetzen"
 
+#. module: project_issue
+#: view:project.issue:0
+msgid "Today"
+msgstr "Heute"
+
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.open_board_project_issue
 #: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue
@@ -393,11 +391,6 @@ msgstr "Stufe"
 msgid "History Information"
 msgstr "Information Historie"
 
-#. module: project_issue
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
 #: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree
@@ -514,11 +507,6 @@ msgstr "Eskalation"
 msgid "Feature Requests"
 msgstr "Feature Anfrage"
 
-#. module: project_issue
-#: 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 !"
-
 #. module: project_issue
 #: field:project.issue,write_date:0
 msgid "Update Date"
@@ -548,11 +536,6 @@ msgstr ""
 "Emails zu diesem Vorgang. Trenne mehrere Email Kopie Empfänger durch eine "
 "Komma separierte Auflistung in diesem Feld."
 
-#. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr "Wartung"
-
 #. module: project_issue
 #: selection:project.issue,state:0
 #: selection:project.issue.report,state:0
@@ -566,9 +549,11 @@ msgid "Low"
 msgstr "Gering"
 
 #. module: project_issue
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler ! Sie können kein rekursives Menü erzeugen."
+#: field:project.issue,date_closed:0
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Closed"
+msgstr "Beendet"
 
 #. module: project_issue
 #: field:project.issue.report,delay_close:0
@@ -625,11 +610,6 @@ msgstr "Zu erledigen"
 msgid "June"
 msgstr "Juni"
 
-#. module: project_issue
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein !"
-
 #. module: project_issue
 #: field:project.issue,day_close:0
 msgid "Days to Close"
@@ -778,14 +758,6 @@ msgstr "Offen"
 msgid "Issues"
 msgstr "Probleme"
 
-#. module: project_issue
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Die Object Bezeichnung muss mit x_ beginnen und darf kein Sonderzeichen "
-"haben !"
-
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage
 #: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_state
@@ -886,11 +858,6 @@ msgstr ""
 "Wenn der Vorgang vor Weiterbearbeitung geprüft werden soll ist der Status "
 "'Unerledigt' ."
 
-#. module: project_issue
-#: 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 !"
-
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
@@ -1007,5 +974,32 @@ msgstr "Dauer"
 msgid "My Open Issues by Creation Date"
 msgstr "Meine offenen Probleme nach Erstelldatum"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Fehlerhafte Modellbezeichnung für diese Aktion."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler ! Sie können kein rekursives Menü erzeugen."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Die Object Bezeichnung muss mit x_ beginnen und darf kein Sonderzeichen "
+#~ "haben !"
+
 #~ msgid "Emails"
 #~ msgstr "Emails"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ 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 group must be unique !"
+#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/project_issue/i18n/es.po b/addons/project_issue/i18n/es.po
index a6f53ce5f5f..9b613506085 100644
--- a/addons/project_issue/i18n/es.po
+++ b/addons/project_issue/i18n/es.po
@@ -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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_issue
diff --git a/addons/project_issue/i18n/fr.po b/addons/project_issue/i18n/fr.po
index 4ecde0f43ac..0fbf4f9693d 100644
--- a/addons/project_issue/i18n/fr.po
+++ b/addons/project_issue/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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-30 12:19+0000\n"
 "Last-Translator: <>\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-10-30 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_issue
@@ -33,13 +33,8 @@ msgid "Working Hours to Open the Issue"
 msgstr ""
 
 #. module: project_issue
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: project_issue
-#: view:project.issue:0
-msgid "Today"
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
 
 #. module: project_issue
@@ -89,6 +84,19 @@ msgstr ""
 msgid "Days to Open"
 msgstr ""
 
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:0
+#, python-format
+msgid ""
+"You cannot escalate this issue.\n"
+"The relevant Project has not configured the Escalation Project!"
+msgstr ""
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Date Closed"
@@ -181,8 +189,17 @@ msgid ""
 msgstr ""
 
 #. module: project_issue
-#: field:project.issue,date_deadline:0
-msgid "Deadline"
+#: view:project.issue:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.action_project_issue_report
+msgid ""
+"This report on the project issues allows you to analyse the quality of your "
+"support or after-sales services. You can track the issues per age. You can "
+"analyse the time required to open or close an issue, the number of email to "
+"exchange and the time spent on average by issues."
 msgstr ""
 
 #. module: project_issue
@@ -204,6 +221,16 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
+msgid ""
+"Issues such as system bugs, client complains, material breakdowns are "
+"collected here. You can define the stages assigned to the resolution of the "
+"issue on the project. (analysis, development, done) Using the mailgateway "
+"module, the issues can be integrated to an email address (example: "
+"support@mycompany.com)"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Statistics"
@@ -215,10 +242,8 @@ msgid "Convert To Task"
 msgstr ""
 
 #. module: project_issue
-#: field:project.issue,date_closed:0
-#: selection:project.issue,state:0
-#: selection:project.issue.report,state:0
-msgid "Closed"
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
 msgstr ""
 
 #. module: project_issue
@@ -312,6 +337,11 @@ msgstr ""
 msgid "Reset to Draft"
 msgstr ""
 
+#. module: project_issue
+#: view:project.issue:0
+msgid "Today"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.open_board_project_issue
 #: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue
@@ -346,11 +376,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: project_issue
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
 #: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree
@@ -396,6 +421,14 @@ msgid ""
 "which is this opportunity source."
 msgstr ""
 
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_version_action
+msgid ""
+"You can use the issues tracker in OpenERP to handle bugs in the software "
+"development project, to handle claims in after-sales services, etc. Define "
+"here the different versions of your products on which you can work on issues."
+msgstr ""
+
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:0
 #, python-format
@@ -477,19 +510,6 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
-#. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr ""
-
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
-#, python-format
-msgid ""
-"You cannot escalate this issue.\n"
-"The relevant Project has not configured the Escalation Project!"
-msgstr ""
-
 #. module: project_issue
 #: selection:project.issue,state:0
 #: selection:project.issue.report,state:0
@@ -503,8 +523,10 @@ msgid "Low"
 msgstr ""
 
 #. module: project_issue
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: field:project.issue,date_closed:0
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Closed"
 msgstr ""
 
 #. module: project_issue
@@ -710,12 +732,6 @@ msgstr ""
 msgid "Issues"
 msgstr ""
 
-#. module: project_issue
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage
 #: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_state
@@ -770,6 +786,11 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#. module: project_issue
+#: field:project.issue,section_id:0
+msgid "Sales Team"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "May"
@@ -791,11 +812,6 @@ msgstr ""
 msgid "Employee's Name"
 msgstr ""
 
-#. module: project_issue
-#: view:project.issue:0
-msgid "Emails"
-msgstr ""
-
 #. module: project_issue
 #: help:project.issue,state:0
 msgid ""
@@ -897,8 +913,8 @@ msgid "High"
 msgstr ""
 
 #. module: project_issue
-#: field:project.issue,section_id:0
-msgid "Sales Team"
+#: field:project.issue,date_deadline:0
+msgid "Deadline"
 msgstr ""
 
 #. module: project_issue
diff --git a/addons/project_issue/i18n/nl.po b/addons/project_issue/i18n/nl.po
index 37ca0aec1fb..2e4579de566 100644
--- a/addons/project_issue/i18n/nl.po
+++ b/addons/project_issue/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-27 09:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_issue
@@ -34,13 +34,8 @@ msgid "Working Hours to Open the Issue"
 msgstr ""
 
 #. module: project_issue
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: project_issue
-#: view:project.issue:0
-msgid "Today"
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
 
 #. module: project_issue
@@ -90,6 +85,19 @@ msgstr ""
 msgid "Days to Open"
 msgstr ""
 
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:0
+#, python-format
+msgid ""
+"You cannot escalate this issue.\n"
+"The relevant Project has not configured the Escalation Project!"
+msgstr ""
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Date Closed"
@@ -182,8 +190,17 @@ msgid ""
 msgstr ""
 
 #. module: project_issue
-#: field:project.issue,date_deadline:0
-msgid "Deadline"
+#: view:project.issue:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.action_project_issue_report
+msgid ""
+"This report on the project issues allows you to analyse the quality of your "
+"support or after-sales services. You can track the issues per age. You can "
+"analyse the time required to open or close an issue, the number of email to "
+"exchange and the time spent on average by issues."
 msgstr ""
 
 #. module: project_issue
@@ -205,6 +222,16 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
+msgid ""
+"Issues such as system bugs, client complains, material breakdowns are "
+"collected here. You can define the stages assigned to the resolution of the "
+"issue on the project. (analysis, development, done) Using the mailgateway "
+"module, the issues can be integrated to an email address (example: "
+"support@mycompany.com)"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Statistics"
@@ -216,10 +243,8 @@ msgid "Convert To Task"
 msgstr ""
 
 #. module: project_issue
-#: field:project.issue,date_closed:0
-#: selection:project.issue,state:0
-#: selection:project.issue.report,state:0
-msgid "Closed"
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
 msgstr ""
 
 #. module: project_issue
@@ -313,6 +338,11 @@ msgstr ""
 msgid "Reset to Draft"
 msgstr ""
 
+#. module: project_issue
+#: view:project.issue:0
+msgid "Today"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.open_board_project_issue
 #: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue
@@ -347,11 +377,6 @@ msgstr ""
 msgid "History Information"
 msgstr ""
 
-#. module: project_issue
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
 #: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree
@@ -397,6 +422,14 @@ msgid ""
 "which is this opportunity source."
 msgstr ""
 
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_version_action
+msgid ""
+"You can use the issues tracker in OpenERP to handle bugs in the software "
+"development project, to handle claims in after-sales services, etc. Define "
+"here the different versions of your products on which you can work on issues."
+msgstr ""
+
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:0
 #, python-format
@@ -478,19 +511,6 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
-#. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr ""
-
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
-#, python-format
-msgid ""
-"You cannot escalate this issue.\n"
-"The relevant Project has not configured the Escalation Project!"
-msgstr ""
-
 #. module: project_issue
 #: selection:project.issue,state:0
 #: selection:project.issue.report,state:0
@@ -504,8 +524,10 @@ msgid "Low"
 msgstr ""
 
 #. module: project_issue
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: field:project.issue,date_closed:0
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Closed"
 msgstr ""
 
 #. module: project_issue
@@ -711,12 +733,6 @@ msgstr ""
 msgid "Issues"
 msgstr ""
 
-#. module: project_issue
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage
 #: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_state
@@ -771,6 +787,11 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#. module: project_issue
+#: field:project.issue,section_id:0
+msgid "Sales Team"
+msgstr ""
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "May"
@@ -792,11 +813,6 @@ msgstr ""
 msgid "Employee's Name"
 msgstr ""
 
-#. module: project_issue
-#: view:project.issue:0
-msgid "Emails"
-msgstr ""
-
 #. module: project_issue
 #: help:project.issue,state:0
 msgid ""
@@ -898,8 +914,8 @@ msgid "High"
 msgstr ""
 
 #. module: project_issue
-#: field:project.issue,section_id:0
-msgid "Sales Team"
+#: field:project.issue,date_deadline:0
+msgid "Deadline"
 msgstr ""
 
 #. module: project_issue
diff --git a/addons/project_issue/i18n/pl.po b/addons/project_issue/i18n/pl.po
index ab1304d10cf..c2ee470e079 100644
--- a/addons/project_issue/i18n/pl.po
+++ b/addons/project_issue/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-29 11:33+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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_issue
@@ -34,13 +34,8 @@ msgid "Working Hours to Open the Issue"
 msgstr ""
 
 #. module: project_issue
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#. module: project_issue
-#: view:project.issue:0
-msgid "Today"
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
 
 #. module: project_issue
@@ -90,6 +85,21 @@ msgstr ""
 msgid "Days to Open"
 msgstr "Dni do otwarcia"
 
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:0
+#, python-format
+msgid ""
+"You cannot escalate this issue.\n"
+"The relevant Project has not configured the Escalation Project!"
+msgstr ""
+"Nie możesz przydzielić tego problemu.\n"
+"W projekcie nie zdefiniowano projektu przydzielania."
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Date Closed"
@@ -184,9 +194,18 @@ msgstr ""
 "liście projektu tutaj wybranego."
 
 #. module: project_issue
-#: field:project.issue,date_deadline:0
-msgid "Deadline"
-msgstr "Termin"
+#: view:project.issue:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.action_project_issue_report
+msgid ""
+"This report on the project issues allows you to analyse the quality of your "
+"support or after-sales services. You can track the issues per age. You can "
+"analyse the time required to open or close an issue, the number of email to "
+"exchange and the time spent on average by issues."
+msgstr ""
 
 #. module: project_issue
 #: view:project.issue:0
@@ -207,6 +226,16 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
+msgid ""
+"Issues such as system bugs, client complains, material breakdowns are "
+"collected here. You can define the stages assigned to the resolution of the "
+"issue on the project. (analysis, development, done) Using the mailgateway "
+"module, the issues can be integrated to an email address (example: "
+"support@mycompany.com)"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Statistics"
@@ -218,11 +247,9 @@ msgid "Convert To Task"
 msgstr "Skonwertuj do zadania"
 
 #. module: project_issue
-#: field:project.issue,date_closed:0
-#: selection:project.issue,state:0
-#: selection:project.issue.report,state:0
-msgid "Closed"
-msgstr "Zamknięte"
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr ""
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_project_issue_report
@@ -315,6 +342,11 @@ msgstr "Telefon"
 msgid "Reset to Draft"
 msgstr "Przywróć do projektu"
 
+#. module: project_issue
+#: view:project.issue:0
+msgid "Today"
+msgstr ""
+
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.open_board_project_issue
 #: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue
@@ -349,11 +381,6 @@ msgstr "Etap"
 msgid "History Information"
 msgstr "Informacja o historii"
 
-#. module: project_issue
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Niewłaściwy XML dla architektury widoku!"
-
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
 #: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree
@@ -401,6 +428,14 @@ msgstr ""
 "Kanały są różnymi, dostępnymi trybami komunikacji z klientem. Do każdej "
 "szansy możesz dowiązać kanał, który jest jej źródłem."
 
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_version_action
+msgid ""
+"You can use the issues tracker in OpenERP to handle bugs in the software "
+"development project, to handle claims in after-sales services, etc. Define "
+"here the different versions of your products on which you can work on issues."
+msgstr ""
+
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:0
 #, python-format
@@ -482,21 +517,6 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
-#. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr ""
-
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
-#, python-format
-msgid ""
-"You cannot escalate this issue.\n"
-"The relevant Project has not configured the Escalation Project!"
-msgstr ""
-"Nie możesz przydzielić tego problemu.\n"
-"W projekcie nie zdefiniowano projektu przydzielania."
-
 #. module: project_issue
 #: selection:project.issue,state:0
 #: selection:project.issue.report,state:0
@@ -510,9 +530,11 @@ msgid "Low"
 msgstr "Niski"
 
 #. module: project_issue
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
+#: field:project.issue,date_closed:0
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Closed"
+msgstr "Zamknięte"
 
 #. module: project_issue
 #: field:project.issue.report,delay_close:0
@@ -717,14 +739,6 @@ msgstr "Otwarte"
 msgid "Issues"
 msgstr "Problemy"
 
-#. module: project_issue
-#: 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: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage
 #: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_state
@@ -779,6 +793,11 @@ msgstr ""
 msgid "Description"
 msgstr "Opis"
 
+#. module: project_issue
+#: field:project.issue,section_id:0
+msgid "Sales Team"
+msgstr "Zespół sprzedaży"
+
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "May"
@@ -800,11 +819,6 @@ msgstr ""
 msgid "Employee's Name"
 msgstr "Nazwisko pracownika"
 
-#. module: project_issue
-#: view:project.issue:0
-msgid "Emails"
-msgstr "Emaile"
-
 #. module: project_issue
 #: help:project.issue,state:0
 msgid ""
@@ -913,9 +927,9 @@ msgid "High"
 msgstr "Wysoki"
 
 #. module: project_issue
-#: field:project.issue,section_id:0
-msgid "Sales Team"
-msgstr "Zespół sprzedaży"
+#: field:project.issue,date_deadline:0
+msgid "Deadline"
+msgstr "Termin"
 
 #. module: project_issue
 #: field:project.issue,date_action_last:0
@@ -957,12 +971,21 @@ msgstr ""
 #~ msgid "Section"
 #~ msgstr "Sekcja"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Niewłaściwy XML dla architektury widoku!"
+
 #~ msgid "Won't fix"
 #~ msgstr "Nie do naprawienia"
 
 #~ msgid "Communication history"
 #~ msgstr "Historia komunikacji"
 
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
+
 #~ msgid "Issue Stages"
 #~ msgstr "Etapy problemów"
 
@@ -1009,6 +1032,12 @@ msgstr ""
 #~ msgid "Assignee"
 #~ msgstr "Przypisany"
 
+#~ 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 "In Progress"
 #~ msgstr "W toku"
 
@@ -1021,6 +1050,9 @@ msgstr ""
 #~ msgid "Issue Analysis"
 #~ msgstr "Analiza problemu"
 
+#~ msgid "Emails"
+#~ msgstr "Emaile"
+
 #~ msgid "Name"
 #~ msgstr "Nazwa"
 
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/i18n/pt.po b/addons/project_issue/i18n/pt.po
index f7174e2afb9..81f936a26c0 100644
--- a/addons/project_issue/i18n/pt.po
+++ b/addons/project_issue/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-12 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_issue
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/de.po b/addons/project_issue_sheet/i18n/de.po
index 19b985f3a4d..669f78dd3f1 100644
--- a/addons/project_issue_sheet/i18n/de.po
+++ b/addons/project_issue_sheet/i18n/de.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_issue_sheet
diff --git a/addons/project_issue_sheet/i18n/es.po b/addons/project_issue_sheet/i18n/es.po
index 3a6aca6cc61..00205963857 100644
--- a/addons/project_issue_sheet/i18n/es.po
+++ b/addons/project_issue_sheet/i18n/es.po
@@ -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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_issue_sheet
diff --git a/addons/project_issue_sheet/i18n/fr.po b/addons/project_issue_sheet/i18n/fr.po
index 6869a83409b..b0914ab488e 100644
--- a/addons/project_issue_sheet/i18n/fr.po
+++ b/addons/project_issue_sheet/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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_issue_sheet
diff --git a/addons/project_issue_sheet/i18n/pl.po b/addons/project_issue_sheet/i18n/pl.po
index e82ed7aa1b0..9ad1dfac92e 100644
--- a/addons/project_issue_sheet/i18n/pl.po
+++ b/addons/project_issue_sheet/i18n/pl.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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_issue_sheet
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_issue_sheet/i18n/pt.po b/addons/project_issue_sheet/i18n/pt.po
index fc89a2d792c..f9425cf1f87 100644
--- a/addons/project_issue_sheet/i18n/pt.po
+++ b/addons/project_issue_sheet/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-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_issue_sheet
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/de.po b/addons/project_mailgate/i18n/de.po
index fbc21d214f4..a91792e468b 100644
--- a/addons/project_mailgate/i18n/de.po
+++ b/addons/project_mailgate/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:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-12-01 08:16+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,52 +15,19 @@ 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:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: project_mailgate
-#: 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 !"
-
 #. module: project_mailgate
 #: view:project.task:0
 msgid "History Information"
 msgstr "Information Historie"
 
-#. module: project_mailgate
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
 #. module: project_mailgate
 #: model:ir.model,name:project_mailgate.model_project_task
 msgid "Task"
 msgstr "Aufgabe"
 
-#. module: project_mailgate
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Das Objekt muss mit einem x_ beginnen und darf keine Sonderzeichen "
-"beinhalten !"
-
-#. module: project_mailgate
-#: 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 !"
-
-#. module: project_mailgate
-#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
-msgid "Project MailGateWay"
-msgstr "Projekte Mailgateway"
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Nachrichten"
-
 #. module: project_mailgate
 #: model:ir.module.module,description:project_mailgate.module_meta_information
 msgid ""
@@ -82,9 +49,19 @@ msgstr ""
 "    "
 
 #. module: project_mailgate
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
+msgid "Project MailGateWay"
+msgstr "Projekte Mailgateway"
+
+#. module: project_mailgate
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr ""
+
+#. module: project_mailgate
+#: field:project.task,message_ids:0
+msgid "Messages"
+msgstr "Nachrichten"
 
 #. module: project_mailgate
 #: code:addons/project_mailgate/project_mailgate.py:0
@@ -125,3 +102,21 @@ msgstr "Im Wartezustand"
 #: view:project.task:0
 msgid "History"
 msgstr "Historie"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Das Objekt muss mit einem x_ beginnen und darf keine Sonderzeichen "
+#~ "beinhalten !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/project_mailgate/i18n/es.po b/addons/project_mailgate/i18n/es.po
index 0715de00530..f900734df1b 100644
--- a/addons/project_mailgate/i18n/es.po
+++ b/addons/project_mailgate/i18n/es.po
@@ -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-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mailgate
diff --git a/addons/project_mailgate/i18n/pl.po b/addons/project_mailgate/i18n/pl.po
index dfcc7f2603b..6299bf7d0d6 100644
--- a/addons/project_mailgate/i18n/pl.po
+++ b/addons/project_mailgate/i18n/pl.po
@@ -7,59 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-28 12:29+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-11-29 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: project_mailgate
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "ID certyfikatu modułu musi być unikalne !"
-
 #. module: project_mailgate
 #: view:project.task:0
 msgid "History Information"
 msgstr "Informacja o historii"
 
-#. module: project_mailgate
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Niewłaściwy XML dla architektury widoku!"
-
 #. module: project_mailgate
 #: model:ir.model,name:project_mailgate.model_project_task
 msgid "Task"
 msgstr "Zadanie"
 
-#. module: project_mailgate
-#: 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: project_mailgate
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Rozmiar pola nie może być mniejszy od 1 !"
-
-#. module: project_mailgate
-#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
-msgid "Project MailGateWay"
-msgstr "MailGateWay dla projektu"
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Wiadomosći"
-
 #. module: project_mailgate
 #: model:ir.module.module,description:project_mailgate.module_meta_information
 msgid ""
@@ -81,9 +48,19 @@ msgstr ""
 "    "
 
 #. module: project_mailgate
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Nazwa modułu musi być unikalna !"
+#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
+msgid "Project MailGateWay"
+msgstr "MailGateWay dla projektu"
+
+#. module: project_mailgate
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr ""
+
+#. module: project_mailgate
+#: field:project.task,message_ids:0
+msgid "Messages"
+msgstr "Wiadomosći"
 
 #. module: project_mailgate
 #: code:addons/project_mailgate/project_mailgate.py:0
@@ -124,3 +101,21 @@ msgstr "Oczekujące"
 #: view:project.task:0
 msgid "History"
 msgstr "Historia"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Niewłaściwy XML dla architektury widoku!"
+
+#~ 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 "The name of the module must be unique !"
+#~ msgstr "Nazwa modułu musi być unikalna !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Rozmiar pola nie może być mniejszy od 1 !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "ID certyfikatu modułu musi być unikalne !"
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/i18n/pt.po b/addons/project_mailgate/i18n/pt.po
index 4c2c3dc7213..8c702a39712 100644
--- a/addons/project_mailgate/i18n/pt.po
+++ b/addons/project_mailgate/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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mailgate
diff --git a/addons/project_mailgate/i18n/pt_BR.po b/addons/project_mailgate/i18n/pt_BR.po
index f4158a44f5f..98d1b8e7e70 100644
--- a/addons/project_mailgate/i18n/pt_BR.po
+++ b/addons/project_mailgate/i18n/pt_BR.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-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mailgate
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/ar.po b/addons/project_retro_planning/i18n/ar.po
index fb4906f144f..31425dd83c0 100644
--- a/addons/project_retro_planning/i18n/ar.po
+++ b/addons/project_retro_planning/i18n/ar.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/bg.po b/addons/project_retro_planning/i18n/bg.po
index 54c7a77fc76..0b070b047ab 100644
--- a/addons/project_retro_planning/i18n/bg.po
+++ b/addons/project_retro_planning/i18n/bg.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/bs.po b/addons/project_retro_planning/i18n/bs.po
index 0e0ef3b3fe8..f1fc2289a8b 100644
--- a/addons/project_retro_planning/i18n/bs.po
+++ b/addons/project_retro_planning/i18n/bs.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/ca.po b/addons/project_retro_planning/i18n/ca.po
index e2dc0a2eda2..89cc7d447f6 100644
--- a/addons/project_retro_planning/i18n/ca.po
+++ b/addons/project_retro_planning/i18n/ca.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/cs.po b/addons/project_retro_planning/i18n/cs.po
index 29b11d9a6e7..8d87284620e 100644
--- a/addons/project_retro_planning/i18n/cs.po
+++ b/addons/project_retro_planning/i18n/cs.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/de.po b/addons/project_retro_planning/i18n/de.po
index 16a155a6301..c652e444be5 100644
--- a/addons/project_retro_planning/i18n/de.po
+++ b/addons/project_retro_planning/i18n/de.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/es.po b/addons/project_retro_planning/i18n/es.po
index c8cd5cf4ed2..a5bda2db5f6 100644
--- a/addons/project_retro_planning/i18n/es.po
+++ b/addons/project_retro_planning/i18n/es.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/es_AR.po b/addons/project_retro_planning/i18n/es_AR.po
index 4c1246e1056..b0fc278e7f3 100644
--- a/addons/project_retro_planning/i18n/es_AR.po
+++ b/addons/project_retro_planning/i18n/es_AR.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/es_EC.po b/addons/project_retro_planning/i18n/es_EC.po
index 713789af7c9..bcc1f256978 100644
--- a/addons/project_retro_planning/i18n/es_EC.po
+++ b/addons/project_retro_planning/i18n/es_EC.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/et.po b/addons/project_retro_planning/i18n/et.po
index b83a3eab1ad..385f7fc6bc0 100644
--- a/addons/project_retro_planning/i18n/et.po
+++ b/addons/project_retro_planning/i18n/et.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/fr.po b/addons/project_retro_planning/i18n/fr.po
index 4f86a20aec9..fe4b15e9617 100644
--- a/addons/project_retro_planning/i18n/fr.po
+++ b/addons/project_retro_planning/i18n/fr.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/gl.po b/addons/project_retro_planning/i18n/gl.po
index 319557953ea..f67740ba7d0 100644
--- a/addons/project_retro_planning/i18n/gl.po
+++ b/addons/project_retro_planning/i18n/gl.po
@@ -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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/hr.po b/addons/project_retro_planning/i18n/hr.po
index 657e3ce68a7..28590f2d1ab 100644
--- a/addons/project_retro_planning/i18n/hr.po
+++ b/addons/project_retro_planning/i18n/hr.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/project_retro_planning/i18n/hu.po b/addons/project_retro_planning/i18n/hu.po
index fb4906f144f..31425dd83c0 100644
--- a/addons/project_retro_planning/i18n/hu.po
+++ b/addons/project_retro_planning/i18n/hu.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/id.po b/addons/project_retro_planning/i18n/id.po
index 55b3a26d2b6..f02efbaed75 100644
--- a/addons/project_retro_planning/i18n/id.po
+++ b/addons/project_retro_planning/i18n/id.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/it.po b/addons/project_retro_planning/i18n/it.po
index fc06fddf97a..9ff54759cc4 100644
--- a/addons/project_retro_planning/i18n/it.po
+++ b/addons/project_retro_planning/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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/kab.po b/addons/project_retro_planning/i18n/kab.po
index a4bd32a1be3..3b5b5c00ecf 100644
--- a/addons/project_retro_planning/i18n/kab.po
+++ b/addons/project_retro_planning/i18n/kab.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/ko.po b/addons/project_retro_planning/i18n/ko.po
index adc2f9a2e13..4f640395aea 100644
--- a/addons/project_retro_planning/i18n/ko.po
+++ b/addons/project_retro_planning/i18n/ko.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/lt.po b/addons/project_retro_planning/i18n/lt.po
index fb4906f144f..31425dd83c0 100644
--- a/addons/project_retro_planning/i18n/lt.po
+++ b/addons/project_retro_planning/i18n/lt.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/nl.po b/addons/project_retro_planning/i18n/nl.po
index 8ec1752ccdd..bfc30235226 100644
--- a/addons/project_retro_planning/i18n/nl.po
+++ b/addons/project_retro_planning/i18n/nl.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/nl_BE.po b/addons/project_retro_planning/i18n/nl_BE.po
index 7fce1a25d50..ad668043fd8 100644
--- a/addons/project_retro_planning/i18n/nl_BE.po
+++ b/addons/project_retro_planning/i18n/nl_BE.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/pl.po b/addons/project_retro_planning/i18n/pl.po
index 882e485abfa..243408db5a5 100644
--- a/addons/project_retro_planning/i18n/pl.po
+++ b/addons/project_retro_planning/i18n/pl.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
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_retro_planning/i18n/pt.po b/addons/project_retro_planning/i18n/pt.po
index 6f0e93ece4f..157043d1ec2 100644
--- a/addons/project_retro_planning/i18n/pt.po
+++ b/addons/project_retro_planning/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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/pt_BR.po b/addons/project_retro_planning/i18n/pt_BR.po
index aa4e5bccc66..8724ff62c24 100644
--- a/addons/project_retro_planning/i18n/pt_BR.po
+++ b/addons/project_retro_planning/i18n/pt_BR.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/ro.po b/addons/project_retro_planning/i18n/ro.po
index fb4906f144f..31425dd83c0 100644
--- a/addons/project_retro_planning/i18n/ro.po
+++ b/addons/project_retro_planning/i18n/ro.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/ru.po b/addons/project_retro_planning/i18n/ru.po
index 3ab1fe7f35d..34a995b8dcc 100644
--- a/addons/project_retro_planning/i18n/ru.po
+++ b/addons/project_retro_planning/i18n/ru.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/sl.po b/addons/project_retro_planning/i18n/sl.po
index cbeb8c1f49f..a373a1fc42f 100644
--- a/addons/project_retro_planning/i18n/sl.po
+++ b/addons/project_retro_planning/i18n/sl.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/sq.po b/addons/project_retro_planning/i18n/sq.po
index 68ecf340bc5..35886018ee8 100644
--- a/addons/project_retro_planning/i18n/sq.po
+++ b/addons/project_retro_planning/i18n/sq.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/sr.po b/addons/project_retro_planning/i18n/sr.po
index 24a7c54babc..1838dd11c59 100644
--- a/addons/project_retro_planning/i18n/sr.po
+++ b/addons/project_retro_planning/i18n/sr.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/sv.po b/addons/project_retro_planning/i18n/sv.po
index cf922bd8fe5..da96acdcfd2 100644
--- a/addons/project_retro_planning/i18n/sv.po
+++ b/addons/project_retro_planning/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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/tlh.po b/addons/project_retro_planning/i18n/tlh.po
index b4175417cd7..1e15908e69c 100644
--- a/addons/project_retro_planning/i18n/tlh.po
+++ b/addons/project_retro_planning/i18n/tlh.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/tr.po b/addons/project_retro_planning/i18n/tr.po
index 683b09d9a33..4b3aa1ec2d3 100644
--- a/addons/project_retro_planning/i18n/tr.po
+++ b/addons/project_retro_planning/i18n/tr.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/uk.po b/addons/project_retro_planning/i18n/uk.po
index 1a3cedbfd11..f19558cb1c8 100644
--- a/addons/project_retro_planning/i18n/uk.po
+++ b/addons/project_retro_planning/i18n/uk.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/ur.po b/addons/project_retro_planning/i18n/ur.po
index e34d494bd74..c8ddd74ab9b 100644
--- a/addons/project_retro_planning/i18n/ur.po
+++ b/addons/project_retro_planning/i18n/ur.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/vi.po b/addons/project_retro_planning/i18n/vi.po
index cd579fee2db..d705819d5db 100644
--- a/addons/project_retro_planning/i18n/vi.po
+++ b/addons/project_retro_planning/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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/zh_CN.po b/addons/project_retro_planning/i18n/zh_CN.po
index 997b06be08a..0780d86921d 100644
--- a/addons/project_retro_planning/i18n/zh_CN.po
+++ b/addons/project_retro_planning/i18n/zh_CN.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/zh_TW.po b/addons/project_retro_planning/i18n/zh_TW.po
index 2747d66b6ac..837a7a6bed4 100644
--- a/addons/project_retro_planning/i18n/zh_TW.po
+++ b/addons/project_retro_planning/i18n/zh_TW.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-14 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_scrum/i18n/ar.po b/addons/project_scrum/i18n/ar.po
index b4ed86d3c37..33c170ff588 100644
--- a/addons/project_scrum/i18n/ar.po
+++ b/addons/project_scrum/i18n/ar.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-09-08 16:00+0000\n"
 "Last-Translator: Genie-soft <rawan@genie-soft.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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr ""
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr ""
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr ""
 msgid "View project's tasks"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr ""
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr ""
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -759,6 +764,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -799,19 +810,12 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
 #. module: project_scrum
@@ -819,16 +823,6 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
diff --git a/addons/project_scrum/i18n/bg.po b/addons/project_scrum/i18n/bg.po
index 28e74001360..8b056fe5c0f 100644
--- a/addons/project_scrum/i18n/bg.po
+++ b/addons/project_scrum/i18n/bg.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-02 17:21+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr "Създай задача от \"недовършено\""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Невалидно име на модел при задаването на действие."
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr ""
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr "Проект"
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr "Състояние"
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr "Отказани"
 msgid "View project's tasks"
 msgstr "Прегледай задачите на проекта"
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr ""
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr "Бележка"
 msgid "Draft"
 msgstr "Чернова"
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr "Активен"
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -761,6 +766,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -801,38 +812,19 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-"символи!"
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
 msgstr "Оставащи часове"
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
@@ -1078,6 +1070,18 @@ msgstr ""
 #~ msgid "Projects"
 #~ msgstr "Проекти"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Невалиден XML за преглед на архитектурата"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
+#~ "символи!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Невалидно име на модел при задаването на действие."
+
 #~ msgid ""
 #~ "Total remaining time, can be re-estimated periodically by the assignee of "
 #~ "the task."
diff --git a/addons/project_scrum/i18n/bs.po b/addons/project_scrum/i18n/bs.po
index 5a6642dc46d..8b5be0e142c 100644
--- a/addons/project_scrum/i18n/bs.po
+++ b/addons/project_scrum/i18n/bs.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-11-17 10:41+0000\n"
 "Last-Translator: Miro Glavić <glavicmiro@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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr ""
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr "Projekat"
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr "Stanje"
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr "Poništeno"
 msgid "View project's tasks"
 msgstr "Pogledaj zadatke projekta"
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr ""
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr "Zabilješka"
 msgid "Draft"
 msgstr "Skica"
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr "Aktivan"
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -759,6 +764,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -799,37 +810,19 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv Objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
 msgstr "Preostali Sati"
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
@@ -1069,6 +1062,9 @@ msgstr ""
 msgid "Sprint Review"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+
 #~ msgid "My tasks"
 #~ msgstr "Moji zadaci"
 
@@ -1171,6 +1167,11 @@ msgstr ""
 #~ msgid "Very Low"
 #~ msgstr "Vrlo Nisko"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv Objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
+
 #~ msgid "Description"
 #~ msgstr "Opis"
 
diff --git a/addons/project_scrum/i18n/ca.po b/addons/project_scrum/i18n/ca.po
index 1ebe02675e7..411854ba0b7 100644
--- a/addons/project_scrum/i18n/ca.po
+++ b/addons/project_scrum/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-02 17:18+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr "Crea tasca des de backlogs"
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de model no vàlid en la definició de l'acció."
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -89,6 +84,11 @@ msgstr "Scrum master"
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -149,8 +149,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -173,12 +173,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -204,19 +218,6 @@ msgstr "Projecte"
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -322,14 +323,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -350,14 +351,6 @@ msgstr ""
 msgid "State"
 msgstr "Estat"
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -468,6 +461,14 @@ msgstr "Cancel·lat"
 msgid "View project's tasks"
 msgstr "Vista tasques del projecte"
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -483,11 +484,6 @@ msgstr "Sprint backlog"
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -611,11 +607,6 @@ msgstr "Nota"
 msgid "Draft"
 msgstr "Esborrany"
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -703,6 +694,11 @@ msgstr "Actiu"
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -713,6 +709,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -762,6 +767,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -802,38 +813,19 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-"especial!"
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
 msgstr "Hores restants"
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
@@ -1199,6 +1191,9 @@ msgstr "Revisió del sprint"
 #~ msgid "Projects"
 #~ msgstr "Projectes"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invàlid per a la definició de la vista!"
+
 #~ msgid "Task Details"
 #~ msgstr "Detalls de tasca"
 
@@ -1317,6 +1312,12 @@ msgstr "Revisió del sprint"
 #~ msgid "In Progress"
 #~ msgstr "En progrés"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+#~ "especial!"
+
 #~ msgid "Parent Task"
 #~ msgstr "Tasca pare"
 
@@ -1391,6 +1392,9 @@ msgstr "Revisió del sprint"
 #~ msgid "Delegated To"
 #~ msgstr "Delegat a"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom de model no vàlid en la definició de l'acció."
+
 #~ msgid ""
 #~ "Link this project to an analytic account if you need financial management on "
 #~ "projects. It enables you to connect projects with budgets, planning, cost "
diff --git a/addons/project_scrum/i18n/cs.po b/addons/project_scrum/i18n/cs.po
index e54ddfd2210..0de0f79d8a2 100644
--- a/addons/project_scrum/i18n/cs.po
+++ b/addons/project_scrum/i18n/cs.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-02-04 06: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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr ""
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr ""
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr ""
 msgid "View project's tasks"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr ""
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr ""
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -759,6 +764,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -799,19 +810,12 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
 #. module: project_scrum
@@ -819,16 +823,6 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
diff --git a/addons/project_scrum/i18n/de.po b/addons/project_scrum/i18n/de.po
index c3443425615..a3e4f4d5f65 100644
--- a/addons/project_scrum/i18n/de.po
+++ b/addons/project_scrum/i18n/de.po
@@ -6,7 +6,7 @@ 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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-12-01 09:42+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -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-02 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -49,11 +49,6 @@ msgstr "Verfasser"
 msgid "What did you do since the last meeting?"
 msgstr "Was erledigten Sie seit dem letzten Meeting?"
 
-#. module: project_scrum
-#: 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 !"
-
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.product.backlog:0
@@ -66,11 +61,6 @@ msgstr "Gruppierung..."
 msgid "Create task from backlogs"
 msgstr "Erzeuge Aufgabe aus Backlog"
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -94,6 +84,11 @@ msgstr "Scrum Master"
 msgid "The sprint '%s' has been opened."
 msgstr "Der Sprint '%s' wurde eröffnet."
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "Fehler! Der Projektstart mus vor dem Projektende liegen"
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -154,9 +149,9 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
-msgstr "Geschätze Barbeitungszeit für Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
 
 #. module: project_scrum
 #: field:project.scrum.sprint,name:0
@@ -192,6 +187,12 @@ msgstr ""
 msgid "Please provide email address for product owner defined on sprint."
 msgstr "Bitte geben Sie die EMail des Product Owners an"
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -321,17 +322,17 @@ msgstr "Thema"
 msgid "Sprints"
 msgstr "Sprints"
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
+msgstr ""
+
 #. module: project_scrum
 #: field:project.scrum.backlog.assign.sprint,convert_to_task:0
 msgid "Convert To Task"
 msgstr "Konvertiere zu Aufgabe"
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
-msgstr "Scrum Meeting für"
-
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
 msgid "Are you sure you want to merge these Backlogs?"
@@ -342,11 +343,6 @@ msgstr "Sollen diese Backlogs wirklich zusammengefasst werden?"
 msgid "Responsible user who can work on task"
 msgstr "Verantwortl. Mitarbeiter für Aufgabe"
 
-#. module: project_scrum
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: field:project.scrum.product.backlog,state:0
@@ -491,11 +487,6 @@ msgstr "Sprint Backlog"
 msgid "Delegate"
 msgstr "Delegieren"
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -615,32 +606,12 @@ msgstr "Sprint Rückbetrachtung"
 msgid "Note"
 msgstr "Bemerkung"
 
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (one month) on which "
-"the team implement a list of product backlogs. The sprint review is "
-"organized when the team presents his work to the customer and product owner."
-msgstr ""
-"Die Scrum Methodik wird in Softwareentwicklungsprojekten eingesetzt. Bei "
-"dieser Methode repräsentiert ein Sprint einen genau definierten kurzen "
-"Zeitabschnitt (ein Monat) für den ein Projektteam eine vereinbarte Liste an "
-"Produkt Backlogs umsetzt. Der Sprint Review soll dann kurzfristig eine "
-"kritische Rückbetrachtung auf das Projekt bei der Ergebnispräsentation "
-"gegenüber dem Kunden oder dem Produkt Owner ermöglichen."
-
 #. module: project_scrum
 #: selection:project.scrum.product.backlog,state:0
 #: selection:project.scrum.sprint,state:0
 msgid "Draft"
 msgstr "Entwurf"
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -730,6 +701,11 @@ msgstr "Aktiv"
 msgid "Scrum Meetings"
 msgstr "Scrum Meetings"
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr "Geschätze Barbeitungszeit für Backlog"
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -804,6 +780,12 @@ msgstr "Sende an Product Owner"
 msgid "Backlog Progress"
 msgstr "Fortschritt Backlog"
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -838,57 +820,31 @@ msgstr "Offen"
 msgid "Effective hours"
 msgstr "Effektive Stunden"
 
-#. module: project_scrum
-#: 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 !"
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Information"
 msgstr "Information"
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
-" Email wurde nicht gesendet an den Product Owner  %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
+"Die Scrum Methodik wird in Softwareentwicklungsprojekten eingesetzt. Bei "
+"dieser Methode repräsentiert ein Sprint einen genau definierten kurzen "
+"Zeitabschnitt (ein Monat) für den ein Projektteam eine vereinbarte Liste an "
+"Produkt Backlogs umsetzt. Der Sprint Review soll dann kurzfristig eine "
+"kritische Rückbetrachtung auf das Projekt bei der Ergebnispräsentation "
+"gegenüber dem Kunden oder dem Produkt Owner ermöglichen."
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
 msgstr "Verbleibende Stunden"
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-" Email wurde nicht gesendet an den Scrum Master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
@@ -1259,6 +1215,9 @@ msgstr "Sprint Rückbetrachtung"
 #~ msgid "Projects"
 #~ msgstr "Projekte"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "Task Details"
 #~ msgstr "Aufgabenliste"
 
@@ -1381,6 +1340,12 @@ msgstr "Sprint Rückbetrachtung"
 #~ msgid "In Progress"
 #~ msgstr "In Bearbeitung"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "Parent Task"
 #~ msgstr "(Ober-) Aufgabe"
 
@@ -1475,8 +1440,8 @@ msgstr "Sprint Rückbetrachtung"
 #~ msgid "Set Open"
 #~ msgstr "Setze auf Offen"
 
-#~ msgid "Error! project start-date must be lower then project end-date."
-#~ msgstr "Fehler! Der Projektstart mus vor dem Projektende liegen"
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
 #, python-format
 #~ msgid ""
@@ -1495,3 +1460,43 @@ msgstr "Sprint Rückbetrachtung"
 #~ "            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
 #~ "context=context)\n"
 #~ "            message = _('Product Backlog"
+
+#, python-format
+#~ msgid "Scrum Meeting of"
+#~ msgstr "Scrum Meeting für"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+
+#, python-format
+#~ msgid ""
+#~ " Email Not send to the product owner %s!' % "
+#~ "meeting_id.sprint_id.product_owner_id.name))\n"
+#~ "        else:\n"
+#~ "            raise osv.except_osv(_('Error !"
+#~ msgstr ""
+#~ " Email wurde nicht gesendet an den Product Owner  %s!' % "
+#~ "meeting_id.sprint_id.product_owner_id.name))\n"
+#~ "        else:\n"
+#~ "            raise osv.except_osv(_('Error !"
+
+#, python-format
+#~ msgid ""
+#~ " Email Not send to the scrum master %s!' % "
+#~ "meeting_id.sprint_id.scrum_master_id.name))\n"
+#~ "        else:\n"
+#~ "            raise osv.except_osv(_('Error !"
+#~ msgstr ""
+#~ " Email wurde nicht gesendet an den Scrum Master %s!' % "
+#~ "meeting_id.sprint_id.scrum_master_id.name))\n"
+#~ "        else:\n"
+#~ "            raise osv.except_osv(_('Error !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/project_scrum/i18n/el.po b/addons/project_scrum/i18n/el.po
index 43df4c7a891..05283dcbd16 100644
--- a/addons/project_scrum/i18n/el.po
+++ b/addons/project_scrum/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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
diff --git a/addons/project_scrum/i18n/es.po b/addons/project_scrum/i18n/es.po
index 8d290261f8e..a0de4bfd125 100644
--- a/addons/project_scrum/i18n/es.po
+++ b/addons/project_scrum/i18n/es.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-09 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
diff --git a/addons/project_scrum/i18n/es_AR.po b/addons/project_scrum/i18n/es_AR.po
index d04b0c81edf..574fe0bda5f 100644
--- a/addons/project_scrum/i18n/es_AR.po
+++ b/addons/project_scrum/i18n/es_AR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-09-23 13:46+0000\n"
 "Last-Translator: Julieta Catalano <jcatalano@thymbra.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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr "Crear tarea desde backlogs"
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr "Scrum master"
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr "Proyecto"
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr "Provincia"
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr "Cancelado"
 msgid "View project's tasks"
 msgstr "Vista tareas del proyecto"
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr "Sprint backlog"
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista !"
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr "Nota"
 msgid "Draft"
 msgstr "Borrador"
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr "Activo"
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -761,6 +766,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -801,38 +812,19 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
 msgstr "Horas restantes"
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
diff --git a/addons/project_scrum/i18n/et.po b/addons/project_scrum/i18n/et.po
index 3ad546f97ef..4bd594402da 100644
--- a/addons/project_scrum/i18n/et.po
+++ b/addons/project_scrum/i18n/et.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-28 08:22+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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr "Loo ülesanded backlogist"
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr "Scrum meister"
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr "Projekt"
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr "Olek"
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr "Tühistatud"
 msgid "View project's tasks"
 msgstr "Vaata projekti ülesandeid"
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr "Sprint Backlog"
 msgid "Delegate"
 msgstr "Delegeeri"
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr "Märkus"
 msgid "Draft"
 msgstr "Mustand"
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr "Aktiivne"
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr "Ühenda"
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -761,6 +766,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -801,37 +812,19 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
-#. module: project_scrum
-#: 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: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
 msgstr "Järelejäänud tunnid"
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
@@ -1131,6 +1124,9 @@ msgstr "Sprindi ülevaade"
 #~ msgid "Projects"
 #~ msgstr "Projektid"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Vigane XML vaate arhitektuurile!"
+
 #~ msgid "Task Details"
 #~ msgstr "Ülesande üksikasjad"
 
@@ -1197,6 +1193,11 @@ msgstr "Sprindi ülevaade"
 #~ msgid "In Progress"
 #~ msgstr "Töös"
 
+#~ 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 "Parent Task"
 #~ msgstr "Ülemülesanne"
 
@@ -1245,6 +1246,9 @@ msgstr "Sprindi ülevaade"
 #~ msgid "My opened sprints (Product Owner)"
 #~ msgstr "Minu avatud sprindid (toote omanik)"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
+
 #~ msgid "Scrum Product backlog"
 #~ msgstr "Scrum toodete backlog"
 
diff --git a/addons/project_scrum/i18n/fr.po b/addons/project_scrum/i18n/fr.po
index afce2c02cb9..76e7f2b585b 100644
--- a/addons/project_scrum/i18n/fr.po
+++ b/addons/project_scrum/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-30 16:45+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 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -48,11 +48,6 @@ msgstr ""
 msgid "What did you do since the last meeting?"
 msgstr ""
 
-#. module: project_scrum
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.product.backlog:0
@@ -65,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr "Créer une tâche à partir des référentiels"
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -93,6 +83,11 @@ msgstr "Scrum Master"
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -153,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -191,6 +186,12 @@ msgstr ""
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -341,11 +342,6 @@ msgstr ""
 msgid "Responsible user who can work on task"
 msgstr ""
 
-#. module: project_scrum
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: field:project.scrum.product.backlog,state:0
@@ -487,11 +483,6 @@ msgstr "Retard du Sprint"
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue"
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -609,26 +600,12 @@ msgstr "Retrospective du Sprint"
 msgid "Note"
 msgstr "Note"
 
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (one month) on which "
-"the team implement a list of product backlogs. The sprint review is "
-"organized when the team presents his work to the customer and product owner."
-msgstr ""
-
 #. module: project_scrum
 #: selection:project.scrum.product.backlog,state:0
 #: selection:project.scrum.sprint,state:0
 msgid "Draft"
 msgstr "Brouillon"
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -716,6 +693,11 @@ msgstr "Actif"
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -784,6 +766,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -818,49 +806,25 @@ msgstr "Ouvert"
 msgid "Effective hours"
 msgstr "Heures effectives"
 
-#. module: project_scrum
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
-"spéciaux !"
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
@@ -1191,6 +1155,9 @@ msgstr "Critique du Sprint"
 #~ msgid "Projects"
 #~ msgstr "Projets"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valide pour l'architecture de la vue"
+
 #~ msgid "Task Details"
 #~ msgstr "Détails de la tâche"
 
@@ -1254,6 +1221,12 @@ msgstr "Critique du Sprint"
 #~ msgid "Task summary"
 #~ msgstr "Résumé de la tâche"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+#~ "spéciaux !"
+
 #~ msgid "Parent Task"
 #~ msgstr "Tâche parente"
 
diff --git a/addons/project_scrum/i18n/gu.po b/addons/project_scrum/i18n/gu.po
index fc4f7a74979..cf37afc7a6e 100644
--- a/addons/project_scrum/i18n/gu.po
+++ b/addons/project_scrum/i18n/gu.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-02 15:36+0000\n"
 "Last-Translator: mra (Open ERP) <mra@tinyerp.com>\n"
 "Language-Team: Gujarati <gu@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:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -89,6 +84,11 @@ msgstr ""
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -149,8 +149,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -173,12 +173,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -204,19 +218,6 @@ msgstr ""
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -322,14 +323,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -350,14 +351,6 @@ msgstr ""
 msgid "State"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -468,6 +461,14 @@ msgstr ""
 msgid "View project's tasks"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -483,11 +484,6 @@ msgstr ""
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -611,11 +607,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -703,6 +694,11 @@ msgstr ""
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -713,6 +709,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -760,6 +765,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -800,19 +811,12 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
 #. module: project_scrum
@@ -820,16 +824,6 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
diff --git a/addons/project_scrum/i18n/hr.po b/addons/project_scrum/i18n/hr.po
index 0fb111cbaa4..81f1275a081 100644
--- a/addons/project_scrum/i18n/hr.po
+++ b/addons/project_scrum/i18n/hr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr ""
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr ""
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr ""
 msgid "View project's tasks"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr ""
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr ""
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -759,6 +764,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -799,19 +810,12 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
 #. module: project_scrum
@@ -819,16 +823,6 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
diff --git a/addons/project_scrum/i18n/hu.po b/addons/project_scrum/i18n/hu.po
index 0fb111cbaa4..862b384fbe9 100644
--- a/addons/project_scrum/i18n/hu.po
+++ b/addons/project_scrum/i18n/hu.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr ""
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr ""
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr ""
 msgid "View project's tasks"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr ""
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr ""
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -759,6 +764,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -799,19 +810,12 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
 #. module: project_scrum
@@ -819,16 +823,6 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
diff --git a/addons/project_scrum/i18n/id.po b/addons/project_scrum/i18n/id.po
index 90ef562aaea..725a6e9c904 100644
--- a/addons/project_scrum/i18n/id.po
+++ b/addons/project_scrum/i18n/id.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-11-09 13:58+0000\n"
 "Last-Translator: <>\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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr ""
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr ""
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr ""
 msgid "View project's tasks"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr ""
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr ""
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -759,6 +764,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -799,19 +810,12 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
 #. module: project_scrum
@@ -819,16 +823,6 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
diff --git a/addons/project_scrum/i18n/it.po b/addons/project_scrum/i18n/it.po
index c8935ab65c0..8f95cd598cd 100644
--- a/addons/project_scrum/i18n/it.po
+++ b/addons/project_scrum/i18n/it.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2008-11-08 09:17+0000\n"
 "Last-Translator: LucaSub <subluca@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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr "Responsabile Scrum"
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr "Progetto"
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr "Stato"
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr "Annullato"
 msgid "View project's tasks"
 msgstr "Visualizza Attività Progetto"
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr "Sprint Arretrati"
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr "Nota"
 msgid "Draft"
 msgstr "Bozza"
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr "Attivo"
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -759,6 +764,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -799,38 +810,19 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
@@ -1127,6 +1119,9 @@ msgstr "Revisione Sprint"
 #~ msgid "Projects"
 #~ msgstr "Progetti"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per Visualizzazione Architettura!"
+
 #~ msgid "Task Details"
 #~ msgstr "Dettagli Attività"
 
@@ -1196,6 +1191,12 @@ msgstr "Revisione Sprint"
 #~ msgid "Task summary"
 #~ msgstr "Riassunto Attività"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
+
 #~ msgid "Parent Task"
 #~ msgstr "Attività Superiore"
 
diff --git a/addons/project_scrum/i18n/ko.po b/addons/project_scrum/i18n/ko.po
index e59b9576d19..6add2e66236 100644
--- a/addons/project_scrum/i18n/ko.po
+++ b/addons/project_scrum/i18n/ko.po
@@ -8,14 +8,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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-02 15:11+0000\n"
 "Last-Translator: Bundo <bundo@bundo.biz>\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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -62,11 +62,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr "백로그로부터 과제 생성"
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "액션 정의에서 유효하지 않은 모델 이름"
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -90,6 +85,11 @@ msgstr "스크럼 마스터"
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -150,8 +150,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -174,12 +174,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -205,19 +219,6 @@ msgstr "프로젝트"
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -323,14 +324,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -351,14 +352,6 @@ msgstr ""
 msgid "State"
 msgstr "상태"
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -469,6 +462,14 @@ msgstr "취소됨"
 msgid "View project's tasks"
 msgstr "프로젝트 과제 보기"
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -484,11 +485,6 @@ msgstr "스프린트 백로그"
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "유효하지 않은 아키텍처를 위한 XML 보기!"
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -612,11 +608,6 @@ msgstr "노트"
 msgid "Draft"
 msgstr "초안"
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -704,6 +695,11 @@ msgstr "활성"
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -714,6 +710,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -761,6 +766,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -801,36 +812,19 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함하면 안 됩니다 !"
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
 msgstr "남은 시간"
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
@@ -1357,17 +1351,27 @@ msgstr "스프린트 검토"
 #~ msgid "Warn Partner"
 #~ msgstr "파트너에게 알림"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "액션 정의에서 유효하지 않은 모델 이름"
+
 #~ msgid "Task summary"
 #~ msgstr "과제 요약"
 
 #~ msgid "Running"
 #~ msgstr "실행 중"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함하면 안 됩니다 !"
+
 #~ msgid "In Progress"
 #~ msgstr "진행중"
 
 #~ msgid "Warn Manager"
 #~ msgstr "매니저에게 알림"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "유효하지 않은 아키텍처를 위한 XML 보기!"
+
 #~ msgid "My Sprints (Product Owner)"
 #~ msgstr "나의 스프린트 (상품 소유자)"
diff --git a/addons/project_scrum/i18n/lt.po b/addons/project_scrum/i18n/lt.po
index 0fb111cbaa4..862b384fbe9 100644
--- a/addons/project_scrum/i18n/lt.po
+++ b/addons/project_scrum/i18n/lt.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr ""
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr ""
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr ""
 msgid "View project's tasks"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr ""
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr ""
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -759,6 +764,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -799,19 +810,12 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
 #. module: project_scrum
@@ -819,16 +823,6 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
diff --git a/addons/project_scrum/i18n/nl.po b/addons/project_scrum/i18n/nl.po
index 017a4afb9c3..7b1414eb9d1 100644
--- a/addons/project_scrum/i18n/nl.po
+++ b/addons/project_scrum/i18n/nl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-02 15:07+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr "Maak taak van backlogs"
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de definitie van de actie."
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr "Scrum meester"
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr "Project"
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr "Status"
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr "Geannuleerd"
 msgid "View project's tasks"
 msgstr "Bekijk taken project"
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr "Sprint backlog"
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr "Opmerking"
 msgid "Draft"
 msgstr "Concept"
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr "Actief"
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -761,6 +766,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -801,37 +812,19 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
-#. module: project_scrum
-#: 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: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
 msgstr "Resterende uren"
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
@@ -1232,6 +1225,9 @@ msgstr "Sprint evaluatie"
 #~ msgid "Medium"
 #~ msgstr "Gemiddeld"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML voor weergave!"
+
 #~ msgid "Create Tasks"
 #~ msgstr "Maak taken"
 
@@ -1310,6 +1306,9 @@ msgstr "Sprint evaluatie"
 #~ msgid "Analytic Account"
 #~ msgstr "Kostenplaats"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
+
 #~ msgid ""
 #~ "Total remaining time, can be re-estimated periodically by the assignee of "
 #~ "the task."
@@ -1372,6 +1371,11 @@ msgstr "Sprint evaluatie"
 #~ msgid "In Progress"
 #~ msgstr "In behandeling"
 
+#~ 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 "Timetable working hours to adjust the gantt diagram report"
 #~ msgstr "Tabel met werkuren om de GANTT overzichten correct weer te geven"
 
diff --git a/addons/project_scrum/i18n/nl_BE.po b/addons/project_scrum/i18n/nl_BE.po
index 151ee61c6b9..1e2c088b1cc 100644
--- a/addons/project_scrum/i18n/nl_BE.po
+++ b/addons/project_scrum/i18n/nl_BE.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-04-10 09:36+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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr ""
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr ""
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr ""
 msgid "View project's tasks"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr ""
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr ""
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -759,6 +764,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -799,37 +810,19 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
-#. module: project_scrum
-#: 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 karakters bevatten !"
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
@@ -1068,3 +1061,8 @@ msgstr ""
 #: field:project.scrum.sprint,review:0
 msgid "Sprint Review"
 msgstr ""
+
+#~ 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 karakters bevatten !"
diff --git a/addons/project_scrum/i18n/pl.po b/addons/project_scrum/i18n/pl.po
index ff1f308e306..0cc8b1a8276 100644
--- a/addons/project_scrum/i18n/pl.po
+++ b/addons/project_scrum/i18n/pl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-29 09: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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr "Grupuj wg..."
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr ""
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr "Projekt"
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr "Stan"
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr "Anulowano"
 msgid "View project's tasks"
 msgstr "Widok zadań prjektu"
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr ""
 msgid "Delegate"
 msgstr "Przydziel"
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr "Uwaga"
 msgid "Draft"
 msgstr "Projekt"
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr "Aktywne"
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr "Połącz"
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -761,6 +766,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -801,38 +812,19 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
-#. module: project_scrum
-#: 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: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
 msgstr "Pozostałe godziny"
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
@@ -1111,12 +1103,21 @@ msgstr ""
 #~ msgid "Projects"
 #~ msgstr "Projekty"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
 #~ msgid "Task Details"
 #~ msgstr "Szczegóły zadania"
 
 #~ msgid "Contact"
 #~ msgstr "Kontakt"
 
+#~ 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 "Template"
 #~ msgstr "Szablon"
 
@@ -1195,6 +1196,9 @@ msgstr ""
 #~ msgid "Error ! You can not create recursive projects."
 #~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych projektów."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
 #~ msgid "Delegated Tasks"
 #~ msgstr "Zadania przekazane"
 
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/pt.po b/addons/project_scrum/i18n/pt.po
index 431efa5b354..de60afc95bd 100644
--- a/addons/project_scrum/i18n/pt.po
+++ b/addons/project_scrum/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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
diff --git a/addons/project_scrum/i18n/pt_BR.po b/addons/project_scrum/i18n/pt_BR.po
index af25b1599af..5b6b9b99530 100644
--- a/addons/project_scrum/i18n/pt_BR.po
+++ b/addons/project_scrum/i18n/pt_BR.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-27 03:36+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-11-28 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -48,11 +48,6 @@ msgstr ""
 msgid "What did you do since the last meeting?"
 msgstr ""
 
-#. module: project_scrum
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.product.backlog:0
@@ -65,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr "Criar tarefas a partir dos backlogs"
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da ação."
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -93,6 +83,11 @@ msgstr "Scrum Master"
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -153,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -191,6 +186,12 @@ msgstr ""
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -341,11 +342,6 @@ msgstr ""
 msgid "Responsible user who can work on task"
 msgstr ""
 
-#. module: project_scrum
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: field:project.scrum.product.backlog,state:0
@@ -487,11 +483,6 @@ msgstr "Backlog do Sprint"
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para Arquitetura da View"
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -609,26 +600,12 @@ msgstr "Retrospectiva do Sprint"
 msgid "Note"
 msgstr "Anotação"
 
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (one month) on which "
-"the team implement a list of product backlogs. The sprint review is "
-"organized when the team presents his work to the customer and product owner."
-msgstr ""
-
 #. module: project_scrum
 #: selection:project.scrum.product.backlog,state:0
 #: selection:project.scrum.sprint,state:0
 msgid "Draft"
 msgstr "Esboço"
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -716,6 +693,11 @@ msgstr "Ativo"
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -784,6 +766,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -818,49 +806,25 @@ msgstr "Abrir"
 msgid "Effective hours"
 msgstr "Horas efetivas"
 
-#. module: project_scrum
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-"especial!"
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
 msgstr "Horas Restantes"
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
@@ -1211,6 +1175,9 @@ msgstr "Revisão do Sprint"
 #~ msgid "Projects"
 #~ msgstr "Projetos"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para Arquitetura da View"
+
 #~ msgid "Planned Time"
 #~ msgstr "Tempo Planejado"
 
@@ -1396,6 +1363,9 @@ msgstr "Revisão do Sprint"
 #~ msgid "Expected End"
 #~ msgstr "Término Previsto"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de modelo inválido na definição da ação."
+
 #~ msgid ""
 #~ "Project's member. Not used in any computation, just for information purpose."
 #~ msgstr ""
@@ -1422,3 +1392,9 @@ msgstr "Revisão do Sprint"
 
 #~ msgid "Scrum Team"
 #~ msgstr "Equipe do Scrum"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
+#~ "especial!"
diff --git a/addons/project_scrum/i18n/ro.po b/addons/project_scrum/i18n/ro.po
index 0fb111cbaa4..81f1275a081 100644
--- a/addons/project_scrum/i18n/ro.po
+++ b/addons/project_scrum/i18n/ro.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr ""
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr ""
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr ""
 msgid "View project's tasks"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr ""
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr ""
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -759,6 +764,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -799,19 +810,12 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
 #. module: project_scrum
@@ -819,16 +823,6 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
diff --git a/addons/project_scrum/i18n/ru.po b/addons/project_scrum/i18n/ru.po
index abf118f3074..80f6b7ab6c1 100644
--- a/addons/project_scrum/i18n/ru.po
+++ b/addons/project_scrum/i18n/ru.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-10-23 07:03+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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr "Объединять по..."
 msgid "Create task from backlogs"
 msgstr "Создать задачу из резервов"
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr "Мастер Scrum"
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr "Ok"
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr "Проект"
 msgid "Start Task"
 msgstr "Запуск задания"
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr "Состояние"
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr "Отменено"
 msgid "View project's tasks"
 msgstr "Показать задания проекта"
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr "Задолженности по Sprint-у"
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr "Примечание"
 msgid "Draft"
 msgstr "Черновик"
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr "Активен"
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -761,6 +766,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -801,38 +812,19 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
 msgstr "Оставшиеся часы"
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
@@ -1129,6 +1121,9 @@ msgstr "Обзор Sprint-а"
 #~ msgid "Projects"
 #~ msgstr "Проекты"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра архитектуры!"
+
 #~ msgid "Task Details"
 #~ msgstr "Описание задания"
 
@@ -1195,6 +1190,12 @@ msgstr "Обзор Sprint-а"
 #~ msgid "Task summary"
 #~ msgstr "Обзор задания"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
+
 #~ msgid "Parent Task"
 #~ msgstr "Задание-предок"
 
@@ -1237,6 +1238,9 @@ msgstr "Обзор Sprint-а"
 #~ msgid "Created tasks"
 #~ msgstr "Созданные задания"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Недопустимое имя модели в определении действия."
+
 #~ msgid ""
 #~ "If you check this field, the project manager will receive a request each "
 #~ "time a task is completed by his team."
diff --git a/addons/project_scrum/i18n/sl.po b/addons/project_scrum/i18n/sl.po
index 2a5a571d56b..76658a3b84d 100644
--- a/addons/project_scrum/i18n/sl.po
+++ b/addons/project_scrum/i18n/sl.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-02 16:41+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Napačno ime modela v definiciji dejanja."
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr ""
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr "Projekt"
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr "Stanje"
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr "Preklicano"
 msgid "View project's tasks"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr ""
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr "Opomba"
 msgid "Draft"
 msgstr "Osnutek"
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr "Aktivno"
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -759,6 +764,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -799,37 +810,19 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
 msgstr "Preostale ure"
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
@@ -1069,6 +1062,14 @@ msgstr ""
 msgid "Sprint Review"
 msgstr ""
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
+
 #~ msgid "Template"
 #~ msgstr "Predloga"
 
@@ -1153,6 +1154,9 @@ msgstr ""
 #~ msgid "Contact"
 #~ msgstr "Stik"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Napačno ime modela v definiciji dejanja."
+
 #~ msgid "Importance"
 #~ msgstr "Pomembnost"
 
diff --git a/addons/project_scrum/i18n/sq.po b/addons/project_scrum/i18n/sq.po
index bbd51581066..f5aed166845 100644
--- a/addons/project_scrum/i18n/sq.po
+++ b/addons/project_scrum/i18n/sq.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-02 15:05+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -89,6 +84,11 @@ msgstr ""
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -149,8 +149,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -173,12 +173,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -204,19 +218,6 @@ msgstr ""
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -322,14 +323,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -350,14 +351,6 @@ msgstr ""
 msgid "State"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -468,6 +461,14 @@ msgstr ""
 msgid "View project's tasks"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -483,11 +484,6 @@ msgstr ""
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -611,11 +607,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -703,6 +694,11 @@ msgstr ""
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -713,6 +709,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -760,6 +765,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -800,19 +811,12 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
 #. module: project_scrum
@@ -820,16 +824,6 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
diff --git a/addons/project_scrum/i18n/sv.po b/addons/project_scrum/i18n/sv.po
index fe57c8c2038..474c192a51a 100644
--- a/addons/project_scrum/i18n/sv.po
+++ b/addons/project_scrum/i18n/sv.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2009-04-10 09:37+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -40,31 +40,26 @@ msgstr ""
 #: view:project.scrum.product.backlog:0
 #: field:project.scrum.product.backlog,user_id:0
 msgid "Author"
-msgstr ""
+msgstr "Författare"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "What did you do since the last meeting?"
-msgstr ""
+msgstr "Vad har du gjort sedan sista mötet?"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruppera på..."
 
 #. module: project_scrum
 #: model:process.node,note:project_scrum.process_node_productbacklog0
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -73,7 +68,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.product.backlog,progress:0
 msgid "Progress"
-msgstr ""
+msgstr "Förlopp"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,user_id:0
@@ -88,6 +83,11 @@ msgstr ""
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -102,7 +102,7 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Send Email"
-msgstr ""
+msgstr "Skicka epost"
 
 #. module: project_scrum
 #: constraint:project.task:0
@@ -118,7 +118,7 @@ msgstr ""
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Sätt till preliminär"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge
@@ -145,11 +145,11 @@ msgstr ""
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_email
 msgid "project.scrum.email"
-msgstr ""
+msgstr "project.scrum.email"
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -160,24 +160,38 @@ msgstr ""
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Uppgift"
 
 #. module: project_scrum
 #: view:postpone.wizard:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -201,26 +215,13 @@ msgstr "Projekt"
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
+msgstr "Starta aktivitet"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
 msgid "None"
-msgstr ""
+msgstr "Inga"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
@@ -241,24 +242,24 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.sprint,date_stop:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Slutdatum"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Links"
-msgstr ""
+msgstr "Länkar"
 
 #. module: project_scrum
 #: help:project.scrum.sprint,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr ""
+msgstr "Beräknad från summan av utfört arbete."
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
 msgid "Task for Today"
-msgstr ""
+msgstr "Dagens uppgifter"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.assign.sprint,state_open:0
@@ -273,7 +274,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.sprint,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Startdatum"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
@@ -284,7 +285,7 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Planning"
-msgstr ""
+msgstr "Planering"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
@@ -303,12 +304,12 @@ msgstr ""
 #: field:project.scrum.product.backlog,expected_hours:0
 #: field:project.scrum.sprint,expected_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Planerade timmar"
 
 #. module: project_scrum
 #: field:project.scrum.email,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Ämne"
 
 #. module: project_scrum
 #: view:board.board:0
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr "Status"
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -389,12 +382,12 @@ msgstr ""
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Fel !"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Skapad datum"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -405,18 +398,18 @@ msgstr ""
 #. module: project_scrum
 #: model:ir.ui.menu,name:project_scrum.menu_scrum
 msgid "Scrum"
-msgstr ""
+msgstr "Scrum"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Hello "
-msgstr ""
+msgstr "Hej "
 
 #. module: project_scrum
 #: field:project.scrum.meeting,question_today:0
 msgid "Tasks for today"
-msgstr ""
+msgstr "Dagens uppgifter"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
@@ -429,7 +422,7 @@ msgstr ""
 #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Varning"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
@@ -449,7 +442,7 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Dates"
-msgstr ""
+msgstr "Datum"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
@@ -460,17 +453,25 @@ msgstr ""
 #: selection:project.scrum.product.backlog,state:0
 #: selection:project.scrum.sprint,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Avbruten"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.dblc_proj2
 msgid "View project's tasks"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
-msgstr ""
+msgstr "Dagligen"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,backlog_ids:0
@@ -480,12 +481,7 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Delegate"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Delegera"
 
 #. module: project_scrum
 #: view:board.board:0
@@ -537,13 +533,13 @@ msgstr ""
 #: help:project.scrum.product.backlog,progress:0
 #: help:project.scrum.sprint,progress:0
 msgid "Computed as: Time Spent / Total Time."
-msgstr ""
+msgstr "Beräknas som: nedlagd tid / total tid."
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Month"
-msgstr ""
+msgstr "Månad"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,question_blocks:0
@@ -559,7 +555,7 @@ msgstr ""
 #: view:project.scrum.email:0
 #: field:project.scrum.email,message:0
 msgid "Message"
-msgstr ""
+msgstr "Meddelande"
 
 #. module: project_scrum
 #: field:project.scrum.email,scrum_master_email:0
@@ -608,12 +604,7 @@ msgstr "Anteckning"
 #: selection:project.scrum.product.backlog,state:0
 #: selection:project.scrum.sprint,state:0
 msgid "Draft"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Utkast"
 
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
@@ -632,7 +623,7 @@ msgstr ""
 #: view:postpone.wizard:0
 #: view:project.scrum.product.backlog:0
 msgid "Postpone"
-msgstr ""
+msgstr "Senarelägg"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -640,7 +631,7 @@ msgstr ""
 #: view:project.scrum.sprint:0
 #: selection:project.scrum.sprint,state:0
 msgid "Pending"
-msgstr ""
+msgstr "avvaktande"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -684,7 +675,7 @@ msgstr ""
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Thank you"
-msgstr ""
+msgstr "Tack"
 
 #. module: project_scrum
 #: help:project.scrum.backlog.assign.sprint,convert_to_task:0
@@ -702,6 +693,11 @@ msgstr "Aktiv"
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -759,6 +764,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -799,37 +810,19 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
@@ -1093,6 +1086,11 @@ msgstr ""
 #~ msgid "Assigned to"
 #~ msgstr "Tilldelad till"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
 #~ msgid "Description"
 #~ msgstr "Beskrivning"
 
diff --git a/addons/project_scrum/i18n/tlh.po b/addons/project_scrum/i18n/tlh.po
index 9badde5c3e4..4681fea3275 100644
--- a/addons/project_scrum/i18n/tlh.po
+++ b/addons/project_scrum/i18n/tlh.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-02-03 06:26+0000\n"
 "Last-Translator: <>\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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr ""
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr ""
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr ""
 msgid "View project's tasks"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr ""
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr ""
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -759,6 +764,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -799,19 +810,12 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
 #. module: project_scrum
@@ -819,16 +823,6 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
diff --git a/addons/project_scrum/i18n/tr.po b/addons/project_scrum/i18n/tr.po
index 715a8ddc70f..e41803865c5 100644
--- a/addons/project_scrum/i18n/tr.po
+++ b/addons/project_scrum/i18n/tr.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-09 07:15+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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr ""
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr ""
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr ""
 msgid "View project's tasks"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr ""
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr ""
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -759,6 +764,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -799,19 +810,12 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
 #. module: project_scrum
@@ -819,16 +823,6 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
@@ -1067,3 +1061,6 @@ msgstr ""
 #: field:project.scrum.sprint,review:0
 msgid "Sprint Review"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
diff --git a/addons/project_scrum/i18n/uk.po b/addons/project_scrum/i18n/uk.po
index c215d13577f..14d0292e19d 100644
--- a/addons/project_scrum/i18n/uk.po
+++ b/addons/project_scrum/i18n/uk.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-02-04 06:32+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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr ""
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr ""
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr ""
 msgid "View project's tasks"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr ""
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури Вигляду!"
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr ""
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -759,6 +764,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -799,37 +810,19 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
@@ -1074,3 +1067,11 @@ msgstr ""
 
 #~ msgid "Projects"
 #~ msgstr "Проекти"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильний XML для Архітектури Вигляду!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
diff --git a/addons/project_scrum/i18n/vi.po b/addons/project_scrum/i18n/vi.po
index 68855032ada..90f712cf220 100644
--- a/addons/project_scrum/i18n/vi.po
+++ b/addons/project_scrum/i18n/vi.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-02 15:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -89,6 +84,11 @@ msgstr ""
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -149,8 +149,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -173,12 +173,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -204,19 +218,6 @@ msgstr ""
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -322,14 +323,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -350,14 +351,6 @@ msgstr ""
 msgid "State"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -468,6 +461,14 @@ msgstr ""
 msgid "View project's tasks"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -483,11 +484,6 @@ msgstr ""
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -611,11 +607,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -703,6 +694,11 @@ msgstr ""
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -713,6 +709,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -760,6 +765,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -800,19 +811,12 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
 #. module: project_scrum
@@ -820,16 +824,6 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
diff --git a/addons/project_scrum/i18n/zh_CN.po b/addons/project_scrum/i18n/zh_CN.po
index e99c24fa122..8449275da04 100644
--- a/addons/project_scrum/i18n/zh_CN.po
+++ b/addons/project_scrum/i18n/zh_CN.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-03-20 10:28+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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-10-30 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr "从backlogs创建任务"
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中无效的模块名"
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr "Scrum主管"
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr "项目"
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr "状态"
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr "取消"
 msgid "View project's tasks"
 msgstr "项目任务视图"
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr ""
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效的视图结构xml文件"
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr "备注"
 msgid "Draft"
 msgstr "草稿"
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr "有效"
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -759,6 +764,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -799,36 +810,19 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以x_开头并且不很含有特殊的字符"
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
 msgstr "剩余时间"
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
@@ -1095,6 +1089,9 @@ msgstr "Sprint复审"
 #~ msgid "My opened sprints (Product Owner)"
 #~ msgstr "我待处理的sprints(产品负责人)"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "在这动作定义中无效的模块名"
+
 #~ msgid ""
 #~ "Total remaining time, can be re-estimated periodically by the assignee of "
 #~ "the task."
@@ -1184,6 +1181,9 @@ msgstr "Sprint复审"
 #~ msgid "Projects"
 #~ msgstr "项目"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效的视图结构xml文件"
+
 #~ msgid "Task Details"
 #~ msgstr "任务详情"
 
@@ -1300,6 +1300,10 @@ msgstr "Sprint复审"
 #~ msgid "In Progress"
 #~ msgstr "进展"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名必须以x_开头并且不很含有特殊的字符"
+
 #~ msgid "Parent Task"
 #~ msgstr "上级任务"
 
diff --git a/addons/project_scrum/i18n/zh_TW.po b/addons/project_scrum/i18n/zh_TW.po
index 104d249be40..abab6464af3 100644
--- a/addons/project_scrum/i18n/zh_TW.po
+++ b/addons/project_scrum/i18n/zh_TW.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-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-01-30 13: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-10-30 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -60,11 +60,6 @@ msgstr ""
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
@@ -88,6 +83,11 @@ msgstr ""
 msgid "The sprint '%s' has been opened."
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
@@ -148,8 +148,8 @@ msgid "project.scrum.email"
 msgstr ""
 
 #. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_scrum
@@ -172,12 +172,26 @@ msgstr ""
 msgid "Spent hours"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -203,19 +217,6 @@ msgstr ""
 msgid "Start Task"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
-#, python-format
-msgid ""
-"is converted into Task %d.\"%(task_id,))\n"
-"                self.log(cr, uid, backlog.id, message)\n"
-"            if data['state_open'] and backlog.state == \"draft\":\n"
-"                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-"            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-"context=context)\n"
-"            message = _('Product Backlog"
-msgstr ""
-
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
@@ -321,14 +322,14 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid "Scrum Meeting of"
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
 msgstr ""
 
 #. module: project_scrum
@@ -349,14 +350,6 @@ msgstr ""
 msgid "State"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
@@ -467,6 +460,14 @@ msgstr ""
 msgid "View project's tasks"
 msgstr "项目任务视图"
 
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
@@ -482,11 +483,6 @@ msgstr ""
 msgid "Delegate"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
@@ -610,11 +606,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: project_scrum
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
@@ -702,6 +693,11 @@ msgstr ""
 msgid "Scrum Meetings"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
@@ -712,6 +708,15 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
@@ -759,6 +764,12 @@ msgstr ""
 msgid "Backlog Progress"
 msgstr ""
 
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
@@ -799,19 +810,12 @@ msgid "Information"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
 msgid ""
-" Email Not send to the product owner %s!' % "
-"meeting_id.sprint_id.product_owner_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
 msgstr ""
 
 #. module: project_scrum
@@ -819,16 +823,6 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid ""
-" Email Not send to the scrum master %s!' % "
-"meeting_id.sprint_id.scrum_master_id.name))\n"
-"        else:\n"
-"            raise osv.except_osv(_('Error !"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
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/ar.po b/addons/project_timesheet/i18n/ar.po
index b5b4a67acb6..df15eeedcec 100644
--- a/addons/project_timesheet/i18n/ar.po
+++ b/addons/project_timesheet/i18n/ar.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/bg.po b/addons/project_timesheet/i18n/bg.po
index b5b4a67acb6..df15eeedcec 100644
--- a/addons/project_timesheet/i18n/bg.po
+++ b/addons/project_timesheet/i18n/bg.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/bs.po b/addons/project_timesheet/i18n/bs.po
index adf10fda185..b1e4856d8d3 100644
--- a/addons/project_timesheet/i18n/bs.po
+++ b/addons/project_timesheet/i18n/bs.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/ca.po b/addons/project_timesheet/i18n/ca.po
index ed1c0d2f53e..3ec913c89f3 100644
--- a/addons/project_timesheet/i18n/ca.po
+++ b/addons/project_timesheet/i18n/ca.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/cs.po b/addons/project_timesheet/i18n/cs.po
index 54e4bdd4808..30ad81df4a6 100644
--- a/addons/project_timesheet/i18n/cs.po
+++ b/addons/project_timesheet/i18n/cs.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/de.po b/addons/project_timesheet/i18n/de.po
index b7dbc252035..07e728bf8a0 100644
--- a/addons/project_timesheet/i18n/de.po
+++ b/addons/project_timesheet/i18n/de.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/el.po b/addons/project_timesheet/i18n/el.po
index 9ffe80022f3..b8430711b46 100644
--- a/addons/project_timesheet/i18n/el.po
+++ b/addons/project_timesheet/i18n/el.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/project_timesheet/i18n/es.po b/addons/project_timesheet/i18n/es.po
index 4cf874c5986..0f801251230 100644
--- a/addons/project_timesheet/i18n/es.po
+++ b/addons/project_timesheet/i18n/es.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/es_AR.po b/addons/project_timesheet/i18n/es_AR.po
index 3742c192959..732b2993490 100644
--- a/addons/project_timesheet/i18n/es_AR.po
+++ b/addons/project_timesheet/i18n/es_AR.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/et.po b/addons/project_timesheet/i18n/et.po
index 5b7b4b9b10d..eb90e94d878 100644
--- a/addons/project_timesheet/i18n/et.po
+++ b/addons/project_timesheet/i18n/et.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/fi.po b/addons/project_timesheet/i18n/fi.po
index 282021806bc..9fad42a7fd2 100644
--- a/addons/project_timesheet/i18n/fi.po
+++ b/addons/project_timesheet/i18n/fi.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/fr.po b/addons/project_timesheet/i18n/fr.po
index 91425265430..29a3ff83346 100644
--- a/addons/project_timesheet/i18n/fr.po
+++ b/addons/project_timesheet/i18n/fr.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/gl.po b/addons/project_timesheet/i18n/gl.po
index 688506559d7..4e51d39c148 100644
--- a/addons/project_timesheet/i18n/gl.po
+++ b/addons/project_timesheet/i18n/gl.po
@@ -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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/hr.po b/addons/project_timesheet/i18n/hr.po
index 19ba1d33e22..ec273b0c1e5 100644
--- a/addons/project_timesheet/i18n/hr.po
+++ b/addons/project_timesheet/i18n/hr.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/project_timesheet/i18n/hu.po b/addons/project_timesheet/i18n/hu.po
index b5b4a67acb6..df15eeedcec 100644
--- a/addons/project_timesheet/i18n/hu.po
+++ b/addons/project_timesheet/i18n/hu.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/id.po b/addons/project_timesheet/i18n/id.po
index 256db98353f..4bc4a4bbeb1 100644
--- a/addons/project_timesheet/i18n/id.po
+++ b/addons/project_timesheet/i18n/id.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/it.po b/addons/project_timesheet/i18n/it.po
index b009d3a3075..ece8c5ed72e 100644
--- a/addons/project_timesheet/i18n/it.po
+++ b/addons/project_timesheet/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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/ko.po b/addons/project_timesheet/i18n/ko.po
index 9caf6a7ea5e..13ebc199c50 100644
--- a/addons/project_timesheet/i18n/ko.po
+++ b/addons/project_timesheet/i18n/ko.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/lt.po b/addons/project_timesheet/i18n/lt.po
index 2bceb94bb13..4d90db4af9e 100644
--- a/addons/project_timesheet/i18n/lt.po
+++ b/addons/project_timesheet/i18n/lt.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/lv.po b/addons/project_timesheet/i18n/lv.po
index 9d6c84dfc11..9c6d049a237 100644
--- a/addons/project_timesheet/i18n/lv.po
+++ b/addons/project_timesheet/i18n/lv.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/nl.po b/addons/project_timesheet/i18n/nl.po
index 1874d5e9b27..56281d2e3a5 100644
--- a/addons/project_timesheet/i18n/nl.po
+++ b/addons/project_timesheet/i18n/nl.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/nl_BE.po b/addons/project_timesheet/i18n/nl_BE.po
index 11da4268804..73c132ea4de 100644
--- a/addons/project_timesheet/i18n/nl_BE.po
+++ b/addons/project_timesheet/i18n/nl_BE.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/pl.po b/addons/project_timesheet/i18n/pl.po
index 7e2139d9294..6c46b130328 100644
--- a/addons/project_timesheet/i18n/pl.po
+++ b/addons/project_timesheet/i18n/pl.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
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/i18n/pt.po b/addons/project_timesheet/i18n/pt.po
index 8f61d437c8f..e3c27b9f781 100644
--- a/addons/project_timesheet/i18n/pt.po
+++ b/addons/project_timesheet/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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/pt_BR.po b/addons/project_timesheet/i18n/pt_BR.po
index d9b6704073b..bee1db0af28 100644
--- a/addons/project_timesheet/i18n/pt_BR.po
+++ b/addons/project_timesheet/i18n/pt_BR.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/ro.po b/addons/project_timesheet/i18n/ro.po
index b5b4a67acb6..df15eeedcec 100644
--- a/addons/project_timesheet/i18n/ro.po
+++ b/addons/project_timesheet/i18n/ro.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/ru.po b/addons/project_timesheet/i18n/ru.po
index 8d1391ec790..8a42fabfc40 100644
--- a/addons/project_timesheet/i18n/ru.po
+++ b/addons/project_timesheet/i18n/ru.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/sl.po b/addons/project_timesheet/i18n/sl.po
index 18dc185f439..14d8c3b6104 100644
--- a/addons/project_timesheet/i18n/sl.po
+++ b/addons/project_timesheet/i18n/sl.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/sq.po b/addons/project_timesheet/i18n/sq.po
index 03276a90b13..3ca00be49fe 100644
--- a/addons/project_timesheet/i18n/sq.po
+++ b/addons/project_timesheet/i18n/sq.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/sv.po b/addons/project_timesheet/i18n/sv.po
index 6fda7c5b434..20049f2c3e0 100644
--- a/addons/project_timesheet/i18n/sv.po
+++ b/addons/project_timesheet/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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/tlh.po b/addons/project_timesheet/i18n/tlh.po
index 983df441be0..ef2a1ceec6e 100644
--- a/addons/project_timesheet/i18n/tlh.po
+++ b/addons/project_timesheet/i18n/tlh.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/tr.po b/addons/project_timesheet/i18n/tr.po
index fcaf6e87c83..05506776b28 100644
--- a/addons/project_timesheet/i18n/tr.po
+++ b/addons/project_timesheet/i18n/tr.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/uk.po b/addons/project_timesheet/i18n/uk.po
index 6308ce2c817..5eded481835 100644
--- a/addons/project_timesheet/i18n/uk.po
+++ b/addons/project_timesheet/i18n/uk.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/vi.po b/addons/project_timesheet/i18n/vi.po
index ca2a1f9e077..ec9cc3d5988 100644
--- a/addons/project_timesheet/i18n/vi.po
+++ b/addons/project_timesheet/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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/zh_CN.po b/addons/project_timesheet/i18n/zh_CN.po
index c6940db9ea5..55251ae56e8 100644
--- a/addons/project_timesheet/i18n/zh_CN.po
+++ b/addons/project_timesheet/i18n/zh_CN.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/zh_TW.po b/addons/project_timesheet/i18n/zh_TW.po
index 566d99494a2..fffdb1752c2 100644
--- a/addons/project_timesheet/i18n/zh_TW.po
+++ b/addons/project_timesheet/i18n/zh_TW.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-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
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/ar.po b/addons/purchase/i18n/ar.po
index 7c38ce80b81..e944b1f552b 100644
--- a/addons/purchase/i18n/ar.po
+++ b/addons/purchase/i18n/ar.po
@@ -6,29 +6,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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-10-30 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,location_id:0
-msgid "Destination"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
 msgstr ""
 
 #. module: purchase
@@ -37,43 +60,99 @@ msgid "From Picking"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr ""
 
@@ -83,8 +162,16 @@ msgid "Default Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
 msgstr ""
 
 #. module: purchase
@@ -95,15 +182,10 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -112,13 +194,14 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
 msgstr ""
 
 #. module: purchase
@@ -127,20 +210,27 @@ msgid "Approve Purchase"
 msgstr ""
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
 msgstr ""
 
 #. module: purchase
@@ -152,15 +242,26 @@ msgid "Notes"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -168,20 +269,886 @@ msgid "Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr ""
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+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."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr ""
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -193,467 +1160,41 @@ msgid ""
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr ""
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr ""
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr ""
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr ""
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr ""
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
 msgstr ""
 
 #. module: purchase
@@ -662,177 +1203,348 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr ""
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr ""
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
 msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
+#: report:purchase.order:0
+msgid "Tél. :"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
 msgstr ""
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr ""
 
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
-msgid "Total amount"
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
@@ -846,13 +1558,31 @@ msgid "Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
+#: view:purchase.order:0
+msgid "To Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
 msgstr ""
 
 #. module: purchase
@@ -861,57 +1591,95 @@ msgid "Total"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
 msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: view:purchase.order:0
+msgid "Untaxed amount"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
 msgstr ""
diff --git a/addons/purchase/i18n/bg.po b/addons/purchase/i18n/bg.po
index 5478ff75134..5b74d3b5552 100644
--- a/addons/purchase/i18n/bg.po
+++ b/addons/purchase/i18n/bg.po
@@ -6,30 +6,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 10:12+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@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-10-30 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr "Фактуриран и платен"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
+msgstr "Назначение"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,location_id:0
-msgid "Destination"
-msgstr "Назначение"
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -37,43 +60,99 @@ msgid "From Picking"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr "Проверрено от"
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Невалидно име на модел при задаване на действие"
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr "Доставчик"
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
-msgstr "Доставка"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr "Количество"
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
-msgstr "От поръчка"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
+msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
-msgstr "Потвърдена поръчка"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr "Грешка при фактуриране"
 
@@ -83,9 +162,17 @@ msgid "Default Purchase Pricelist"
 msgstr "Ценова листа при покупка (по подрабиране)"
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
-msgstr "Създаване на фактура"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr ""
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -97,15 +184,10 @@ msgstr ""
 "по подразбиране"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr "Факс :"
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -114,14 +196,15 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
-msgstr "Обработка на покупка"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
-msgstr "Фактура от списък за пакетиране"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -129,21 +212,28 @@ msgid "Approve Purchase"
 msgstr "Одобряване на покупказ"
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr "Одобрен"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
-msgstr "Активни заявки за покупка"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Необложена сума"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -154,15 +244,26 @@ msgid "Notes"
 msgstr "Бележки"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr "Данъци"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -170,20 +271,886 @@ msgid "Purchase Order"
 msgstr "Поръчка за покупка"
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
-msgstr "Благодарности,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr "Общо нето :"
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr "Отказан"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr "Потвърждение"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+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."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr "От поръчка"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr "Създаване на фактура"
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr ""
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr "Поръчки"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Благодарности,"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Необложена сума"
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -195,467 +1162,41 @@ msgid ""
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr "Потвърждение"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr ""
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr ""
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr "Поръчки"
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr ""
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr ""
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr ""
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
 msgstr ""
 
 #. module: purchase
@@ -664,179 +1205,348 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr ""
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr "Откажи"
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
 msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-"символи!"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
+#: report:purchase.order:0
+msgid "Tél. :"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
 msgstr ""
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr "Доставка"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr ""
 
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
-msgid "Total amount"
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
@@ -850,13 +1560,31 @@ msgid "Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
+#: view:purchase.order:0
+msgid "To Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
 msgstr ""
 
 #. module: purchase
@@ -865,57 +1593,119 @@ msgid "Total"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
 msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: view:purchase.order:0
+msgid "Untaxed amount"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
 msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Невалиден XML за преглед на архитектурата"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
+#~ "символи!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Невалидно име на модел при задаване на действие"
+
+#~ msgid "Purchase Process"
+#~ msgstr "Обработка на покупка"
+
+#~ msgid "Invoice from Packing list"
+#~ msgstr "Фактура от списък за пакетиране"
+
+#~ msgid "Confirmed Purchase"
+#~ msgstr "Потвърдена поръчка"
+
+#~ msgid "Purchase Orders in Progress"
+#~ msgstr "Активни заявки за покупка"
diff --git a/addons/purchase/i18n/bs.po b/addons/purchase/i18n/bs.po
index 6b2f1dd8a5d..269e01380eb 100644
--- a/addons/purchase/i18n/bs.po
+++ b/addons/purchase/i18n/bs.po
@@ -6,74 +6,153 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 10:11+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.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-10-30 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr "Račun izdat&Plaćeno"
 
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
-msgstr "Račun dobavljača pregenirisan prilikom primke - kontrole"
-
 #. module: purchase
 #: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
 msgid "Destination"
 msgstr "Odredište"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
 msgstr "Iz zaprimanja"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr "Adresa odredišta"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr "Potvrđeno od"
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Neispravan naziv modela u definiciji zadatka."
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr "Dobavljač"
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
-msgstr "Isporuka"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr "Količina"
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
-msgstr "Iz naloga"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
+msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
-msgstr "Potvrđena nabavka"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr "podesi kao draft"
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr "Iznimka u računu"
 
@@ -83,9 +162,19 @@ msgid "Default Purchase Pricelist"
 msgstr "Standardni nabavni cijenik"
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
-msgstr "Kreiraj račun"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr ""
+"Postavi adresu ukoliko želite predati direktno od dobavljača kupac. U ovom "
+"slučaju, to će se maknuti link skladišta i postaviti lokaciju kupca."
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -97,15 +186,10 @@ msgstr ""
 "partnera"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr "Fax"
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr "Kreiraj račun na osnovu primke robe"
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -116,14 +200,15 @@ msgstr ""
 "izračunava nabavnu cijenu za odabrane proizvode i količinu."
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
-msgstr "Proces nabavke"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
-msgstr "Račun kreiran iz packing liste"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -131,21 +216,28 @@ msgid "Approve Purchase"
 msgstr "Odobri nabavku"
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr "Odobreno"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
-msgstr "Nabavni nalozi u progresu"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Neoporezovan iznos"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr "Kretanje zaliha"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -156,15 +248,26 @@ msgid "Notes"
 msgstr "Napomene"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr "Porezi"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -172,20 +275,888 @@ msgid "Purchase Order"
 msgstr "Nabavni nalog"
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
-msgstr "Vaš,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referenca naloga"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr "Neto ukupno:"
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr "Otkazano"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cijenovnik"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr "Otpremni Izuzeci"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr "Porijeklo"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr "Dolazeći proizvodi"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr "Ručni ispravljeno"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr "Referenca"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Analitičko konto"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr "Neto cijena"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "Red naloga"
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr "Ukupno :"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr "Potvrdi"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr "Kontrola računa"
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr "Tel.:"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "Lista primke"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr "Redovi naloga"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr "Faks:"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+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."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr "Broj potvrde nabavnog naloga"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr "Odobreno od strane dobavljača"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr "Iz naloga"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr "Kreiraj račun"
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr "Odredište rezervacije"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr "Završeno"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr "Ukupni iznos"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr "Ovjereno od strane"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "Zahtjev za ponudu"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr "Ručno"
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr "Draft račun"
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+"Ovo je proračunato kao najbliži predviđeni datuma isporuke koji se nalazi u "
+"svim nabavnim nalozima."
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr "Zahtjev za nabavku"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr "Nabavni nalog - potrebno odobrenje"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "Primljeno"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr "Ovo je lista pakiranja koja je generisana za kupovinu."
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr "Upravljanje nabavkom"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr "Porezi"
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fakturisano"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr "Red nabavnog naloga"
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr "Kalendarski pogled"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Vaš,"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Neoporezovan iznos"
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr "Datum kreiranja dokumenta"
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr "Izračunaj"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "Otkaži nabavni nalog"
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr "Historijat"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr "Referenca dokumenta koja generira ovaj zahtjev za narudžbenicu."
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -204,474 +1175,42 @@ msgstr ""
 "u \"Završeno\". Ukoliko se u jednoj od faza desi otkazivanje računa ili "
 "primke robe, status se mjenja u \"Izuzetak\"."
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr "Porijeklo"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr "Dolazeći proizvodi"
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr "Količina"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr "Ručni ispravljeno"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr "Referenca"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr "PDV"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr "Tel.:"
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr "Analitičko konto"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr "Redovi nabavnog naloga"
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr "Ovjereno od strane"
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-"Iz naloga: draft računa će biti pregenerisan na osnovu nabavnog naloga. "
-"Odgovorna osoba samo mora validirati račun radi kontrole."
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr "Račun baziran na isporukama"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr "Neto cijena"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr "Red naloga"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr "Potvrđeno"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr "Primka proizvoda"
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr "Potvrdi"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr "Kontrola računa"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr "Zahtjev za ponudu"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr "Čekanje"
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr "Lista primke"
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr "Skladište"
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr "Redovi naloga"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr "Potvrdi nabavni nalog iz zahtjeva za ponudu bez porijekla"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr "Faks:"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr "Neoporezovan iznos"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr "Očekivani datum"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr "Adresa isporuke"
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr "Nabavni cijenovnik"
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr "Planirani datum"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr "Odobreno od strane dobavljača"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr "Pakovanje"
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr "Ujedini nabavku"
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr "Odredište rezervacije"
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr "Referenca naloga"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr "Završeno"
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr "Cijenovnik"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr "Kada se kontroliše račun iz naloga"
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr "Predracun dobavljaca na prijemu za kontrolu"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr "Račun generiran iz nabavke"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr "Proces pakiranja je kreiran zarad kontrole primke proizvoda."
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr "Ručno"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr "Potvrđivanje nabavke"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr "Odobri nabavni nalog nakon potvrde"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr "Otpremni Izuzeci"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr "Kodirano ručno od strane korisnika"
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-"Ovo je proračunato kao najbliži predviđeni datuma isporuke koji se nalazi u "
-"svim nabavnim nalozima."
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Nabavni nalozi"
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-"Postavi adresu ukoliko želite predati direktno od dobavljača kupac. U ovom "
-"slučaju, to će se maknuti link skladišta i postaviti lokaciju kupca."
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr "Zahtjev za nabavku"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr "Potvrdi nabavni nalog iz zahtjeva za nabavku"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr "Potvrdi nabavni nalog"
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr "Ovo je lista pakiranja koja je generisana za kupovinu."
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr "Upravljanje nabavkom"
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr "Reference partnera"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr "Porezi"
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr "Fakturisano"
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr "Adresa odredišta"
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr "Red nabavnog naloga"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr "Kalendarski pogled"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr "podesi kao draft"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr "Nabavni nalog odobren od strane dobavljača"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr "Draft račun"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr "Nabavni nalog"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr "Zahtjev za nabavku -  zahtjev iz sistema"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr "Račun pakiranja"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr "Kreiraj račun na osnovu liste isporuke."
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr "Datum kreiranja dokumenta"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr "Isporučeno&Izdat račun"
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr "Datum"
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr "Referenca dokumenta koja generira ovaj zahtjev za narudžbenicu."
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr "Tel.:"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr "Nakon nabavnog naloga kreirajte račun"
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr "Zakazani datum"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr "Naša referenca naloga"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr "TVA:"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr "Izračunaj"
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "Nije moguće imati dva cjenovnika koja se preklapaju!"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr "Otkaži nabavni nalog"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr "Kreiraj listu pakiranja"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr "Ukupno :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr "Odobrenje nabavnog naloga generiše kreiranje liste pakiranja."
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr "Historijat"
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr "Status naloga"
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr "Sub-ukupno"
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr "Čekanje"
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr "Standardna verzija nabavnog cjenika"
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Jedinična cijena"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
@@ -679,181 +1218,349 @@ msgid "Fiscal Position"
 msgstr "Fiskalna pozicija"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr "Zahtjev za ponudu N°"
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr "Faktura"
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr "Odustani"
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
-msgstr "Postavke nabavke"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
-msgstr "Referenca naloga"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr "Nabavni nalozi"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr "Ujedini naloge"
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
 msgstr ""
-"Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
-msgstr "Novi nabavni nalog"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
-msgstr "Primljeno"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr "Zahtjev za ponudu"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
-msgstr "Bez pakiranja"
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr "Tel.:"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
-msgstr "Kontrolisati račun prilikom primke"
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr "Naša referenca naloga"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Skladište"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr "Datum upita"
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr "Datum odobrenja"
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
 msgstr ""
-"Modul za upravljanje nabavkom \n"
-"Zahtjev za ponudu, kreiranje računa dobavljača, printanje naloga..."
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Jedinična cijena"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr "Proizvod"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr "Opis"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
-msgstr "Primka proizvoda na osnovu računa"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr "Adresa očekivane isporuke:"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
-msgstr "Nabavni nalog - potrebno odobrenje"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
-msgstr "Potvrdite nabavni nalog"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr "Isporuka"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr "Proizvod UOM"
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr "Količina"
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr "Rezervacija"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
-msgstr "Nabavni nalog je potvrđen od strane korisnika."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
-msgstr "Faktura nabavke"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr "Referenca vašeg naloga"
 
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr "Broj potvrde nabavnog naloga"
-
 #. module: purchase
 #: view:purchase.order:0
-msgid "Total amount"
-msgstr "Ukupni iznos"
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
+msgstr "Očekivani datum"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr "TVA:"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr "Datum nabavnog naloga"
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr "Adresa isporuke"
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr "Kontrola nabavke"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
-msgstr "Zahtjevi za ponudu"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr "Nabavni cijenovnik"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -866,14 +1573,32 @@ msgid "Approve"
 msgstr "Odobri"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
-msgstr "Odobrena nabavka"
+#: view:purchase.order:0
+msgid "To Approve"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
-msgstr "Iz liste pakovanja kreiraj račun"
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -881,57 +1606,277 @@ msgid "Total"
 msgstr "Ukupno"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr "Da li ste sigurni da želite sastaviti ove naruđbe?"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
-msgstr "Odobriti nabavni nalog"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr "PDV"
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
-msgstr "Nakon što je nabavni nalog odobren prelazi u račun dobavljača."
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
-msgstr "Kretanje zaliha"
-
-#. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr "Neoporezovan iznos"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
+
+#. module: purchase
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+
+#~ msgid "Delivery & Invoices"
+#~ msgstr "Isporučeno&Izdat račun"
+
+#~ msgid "New Purchase Order"
+#~ msgstr "Novi nabavni nalog"
+
+#~ msgid "Approved Purchase"
+#~ msgstr "Odobrena nabavka"
+
+#~ msgid "Request For Quotations"
+#~ msgstr "Zahtjevi za ponudu"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neispravan naziv modela u definiciji zadatka."
+
+#~ msgid "Purchase Process"
+#~ msgstr "Proces nabavke"
+
+#~ msgid "Confirmed Purchase"
+#~ msgstr "Potvrđena nabavka"
+
+#~ msgid "Create invoice from product recept"
+#~ msgstr "Kreiraj račun na osnovu primke robe"
+
+#~ msgid "Invoice from Packing list"
+#~ msgstr "Račun kreiran iz packing liste"
+
+#~ msgid "Purchase Orders in Progress"
+#~ msgstr "Nabavni nalozi u progresu"
+
+#~ msgid "Purchase Order lines"
+#~ msgstr "Redovi nabavnog naloga"
+
+#~ msgid "Product Receipt"
+#~ msgstr "Primka proizvoda"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Račun baziran na isporukama"
+
+#~ msgid "Confirm Purchase order from Request for quotation without origin"
+#~ msgstr "Potvrdi nabavni nalog iz zahtjeva za ponudu bez porijekla"
+
+#~ msgid "Packing"
+#~ msgstr "Pakovanje"
+
+#~ msgid "When controlling invoice from orders"
+#~ msgstr "Kada se kontroliše račun iz naloga"
+
+#~ msgid "Merge purchases"
+#~ msgstr "Ujedini nabavku"
+
+#~ msgid "Planned Date"
+#~ msgstr "Planirani datum"
+
+#~ msgid "Purchase orders"
+#~ msgstr "Nabavni nalozi"
+
+#~ msgid "Encoded manually by the user."
+#~ msgstr "Kodirano ručno od strane korisnika"
+
+#~ msgid "Confirming Purchase"
+#~ msgstr "Potvrđivanje nabavke"
+
+#~ msgid "Pre-generated supplier invoice to control based on order"
+#~ msgstr "Predracun dobavljaca na prijemu za kontrolu"
+
+#~ msgid "Packing is created for the products reception control."
+#~ msgstr "Proces pakiranja je kreiran zarad kontrole primke proizvoda."
+
+#~ msgid "Invoice from Purchase"
+#~ msgstr "Račun generiran iz nabavke"
+
+#~ msgid "Approve Purchase order after Confirming"
+#~ msgstr "Odobri nabavni nalog nakon potvrde"
+
+#~ msgid "Partner Ref."
+#~ msgstr "Reference partnera"
+
+#~ msgid "Confirm Purchase Order"
+#~ msgstr "Potvrdi nabavni nalog"
+
+#~ msgid "Confirm Purchase order from Request for quotation"
+#~ msgstr "Potvrdi nabavni nalog iz zahtjeva za nabavku"
+
+#~ msgid "Purchase order"
+#~ msgstr "Nabavni nalog"
+
+#~ msgid "Request for quotation is proposed by the system."
+#~ msgstr "Zahtjev za nabavku -  zahtjev iz sistema"
+
+#~ msgid "Purchase order is approved by supplier."
+#~ msgstr "Nabavni nalog odobren od strane dobavljača"
+
+#~ msgid "Packing Invoice"
+#~ msgstr "Račun pakiranja"
+
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "Nije moguće imati dva cjenovnika koja se preklapaju!"
+
+#~ msgid "Scheduled date"
+#~ msgstr "Zakazani datum"
+
+#~ msgid "After Purchase order , Create invoice."
+#~ msgstr "Nakon nabavnog naloga kreirajte račun"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Create Packing list"
+#~ msgstr "Kreiraj listu pakiranja"
+
+#~ msgid "Order Status"
+#~ msgstr "Status naloga"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
+
+#~ msgid "Order Ref"
+#~ msgstr "Referenca naloga"
+
+#~ msgid "Purchases Properties"
+#~ msgstr "Postavke nabavke"
+
+#~ msgid "Purchase order is confirmed by the user."
+#~ msgstr "Nabavni nalog je potvrđen od strane korisnika."
+
+#~ msgid "Confirming Purchase Order"
+#~ msgstr "Potvrdite nabavni nalog"
+
+#~ msgid "Purchase Invoice"
+#~ msgstr "Faktura nabavke"
+
+#~ msgid "After approved purchase order , it comes into the supplier invoice"
+#~ msgstr "Nakon što je nabavni nalog odobren prelazi u račun dobavljača."
+
+#~ msgid "Approving Purchase Order"
+#~ msgstr "Odobriti nabavni nalog"
+
+#~ msgid ""
+#~ "Module for purchase management\n"
+#~ "    Request for quotation, Create Supplier Invoice, Print Order..."
+#~ msgstr ""
+#~ "Modul za upravljanje nabavkom \n"
+#~ "Zahtjev za ponudu, kreiranje računa dobavljača, printanje naloga..."
+
+#~ msgid "Out Packing"
+#~ msgstr "Bez pakiranja"
+
+#~ msgid "Control invoices on receptions"
+#~ msgstr "Kontrolisati račun prilikom primke"
+
+#~ msgid "Product recept invoice"
+#~ msgstr "Primka proizvoda na osnovu računa"
+
+#~ msgid "When purchase order is approved , it creates its packing list."
+#~ msgstr "Odobrenje nabavnog naloga generiše kreiranje liste pakiranja."
+
+#~ msgid "Creates invoice from packin list"
+#~ msgstr "Kreiraj račun na osnovu liste isporuke."
+
+#~ msgid "Supplier Invoice pre-generated on receptions for control"
+#~ msgstr "Račun dobavljača pregenirisan prilikom primke - kontrole"
+
+#~ msgid "From Packing list, Create invoice."
+#~ msgstr "Iz liste pakovanja kreiraj račun"
+
+#~ msgid ""
+#~ "From Order: a draft invoice will be pre-generated based on the purchase "
+#~ "order. The accountant will just have to validate this invoice for control.\n"
+#~ "From Picking: a draft invoice will be pre-genearted based on validated "
+#~ "receptions.\n"
+#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
+#~ "manually."
+#~ msgstr ""
+#~ "Iz naloga: draft računa će biti pregenerisan na osnovu nabavnog naloga. "
+#~ "Odgovorna osoba samo mora validirati račun radi kontrole."
diff --git a/addons/purchase/i18n/ca.po b/addons/purchase/i18n/ca.po
index 60b51667483..dd9e60ad7d2 100644
--- a/addons/purchase/i18n/ca.po
+++ b/addons/purchase/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-07 08:22+0000\n"
 "Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-"
 "tic.com>\n"
@@ -14,67 +14,148 @@ msgstr ""
 "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:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr "Facturada & Pagada (conciliada)"
 
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
-msgstr "Factura de proveïdor pre-generada en la recepció per a control"
-
 #. module: purchase
 #: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
 msgid "Destination"
 msgstr "Destí"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+"Heu de seleccionar una UdM del producte de la mateixa categoria que la UdM "
+"de compra del producte"
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
 msgstr "Des de albarà"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr "Adreça del destí"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr "Validat per"
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de model no vàlid en la definició de l'acció."
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr "Proveïdor"
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
-msgstr "Enviament"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
+msgstr "No tarifa!"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr "Quantitat"
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
-msgstr "Des de comanda"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
+msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
-msgstr "Compra confirmada"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr "Canvia a esborrany"
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr "Excepció de factura"
 
@@ -84,9 +165,20 @@ msgid "Default Purchase Pricelist"
 msgstr "Tarifa de compra per defecte"
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
-msgstr "Crea factura"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr ""
+"Introduïu una adreça si voleu enviar directament des de el proveïdor al "
+"client. En aquest caso, s'eliminarà l'enllaç al magatzem i posarà la "
+"ubicació del client."
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -98,15 +190,10 @@ msgstr ""
 "compres de l'empresa actual"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr "Fax:"
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr "Crea factura des de recepció producte"
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -117,14 +204,15 @@ msgstr ""
 "el preu del proveïdor pels productes/quantitats seleccionats."
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
-msgstr "Procés de compra"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
-msgstr "Factura des de albarà"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -132,21 +220,28 @@ msgid "Approve Purchase"
 msgstr "Aprova compra"
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr "Aprovada"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
-msgstr "Comandes de compra en procés"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Base imposable"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr "Moviments d'estoc"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -157,15 +252,26 @@ msgid "Notes"
 msgstr "Notes"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr "Impostos"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -173,20 +279,895 @@ msgid "Purchase Order"
 msgstr "Comanda de compra"
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
-msgstr "Records,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referència comanda"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr "Total net :"
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr "Excepció d'enviament"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr "Origen"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr "Productes entrants"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr "Corregit manualment"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr "Referència"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Compte analític"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr "Preu net"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "Línia de la comanda"
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr "UdM del producte errònia!"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmada"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr "Confirma"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr "Control factura"
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr "Tel.:"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "Albarà"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr "Línies de la comanda"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr "Falta empresa!"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr "Fax:"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Error !"
+msgstr "Error!"
+
+#. 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 ""
+"Heu de seleccionar una empresa al formulari de compra!\n"
+"Si us plau seleccioneu una empresa abans d'escollir un producte."
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr "Confirmació d'ordre de compra Nº"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr "Aprovada pel proveïdor"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr "Des de comanda"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr "Crea factura"
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr "Destinació de la reserva"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Acció no vàlida!"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr "Realitzada"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr "Import total"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr "Validada per"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "Petició pressupost"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr "Factura esborrany"
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+"Això es calcula com la mínima data planificada per a tots els productes de "
+"les línies de la comanda de compra."
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr "Petició de presupost :"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr "Comanda de compra esperant aprovació"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "Rebuda"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr "Aquesta és la llista d'albarans generats per aquesta compra"
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr "Compres"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr "Impostos :"
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturat"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr "Línia de la comanda de compra"
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr "Vista calendari"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Records,"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imposable"
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr "Data de la creació d'aquest document."
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+"No hi ha compte de despeses definida per a aquest producte: \"%s\" (id:%d)"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+"Primer heu de cancel·lar totes les factures associades a aquesta comanda de "
+"compra."
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr "Calcula"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "Cancel·la comanda de compra"
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr "Historial"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+"Referència al document que ha generat aquesta sol·licitud de comanda de "
+"compra."
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -205,482 +1186,42 @@ msgstr ""
 "'Relitzada'. Si una acció de cancel·lació té lloc en la factura o en la "
 "recepció de mercaderies, l'estat es converteix en 'Excepció'."
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr "Origen"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr "Productes entrants"
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr "Qtat"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr "Corregit manualment"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr "Referència"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr "CIF/NIF:"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr "Tel.:"
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr "Compte analític"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr "Línies de la comanda de compra"
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr "Validada per"
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-"Des de comanda: Una factura esborrany es pre-generarà basada en la comanda "
-"de compra. El comptable només haurà de validar aquesta factura per a "
-"control.\n"
-"Des de albarà: Una factura esborrany serà pre-generarà basada en les "
-"recepcions validades.\n"
-"Manual: Cap factura es pre-generarà. El comptable haurà de codificar-la "
-"manualment."
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr "Factura des d'albarans"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr "Preu net"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr "Línia de la comanda"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr "Confirmada"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr "Recepció producte"
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr "Confirma"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr "Control factura"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr "Petició pressupost"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr "En espera"
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr "Albarà"
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magatzem"
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr "Línies de la comanda"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr "Confirma comanda de compra des de petició de pressupost sense origen"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr "Fax:"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr "Base imposable"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr "Data prevista"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr "Adreça d'enviament :"
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr "Tarifa de compra"
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr "Data prevista"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr "Aprovada pel proveïdor"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr "Paquet/Albarà"
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr "Fusiona compres"
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr "Destinació de la reserva"
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr "Referència comanda"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr "Realitzada"
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr "Tarifa"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr "Quan es controla factura des de comandes"
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr "Factura de proveïdor pre-generada per a control basada en comanda"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr "Factura des de compra"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr "Albarà és creat per a el control de recepció de productes."
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr "Manual"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr "Confirmació compra"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr "Aprova comanda de compra després de confirmació"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr "Excepció d'enviament"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr "Codificació manual de l'usuari."
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-"Això es calcula com la mínima data planificada per a tots els productes de "
-"les línies de la comanda de compra."
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Compres"
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-"Introduïu una adreça si voleu enviar directament des de el proveïdor al "
-"client. En aquest caso, s'eliminarà l'enllaç al magatzem i posarà la "
-"ubicació del client."
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr "Petició de presupost :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr "Confirma comanda de compra des de petició de pressupost"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr "Confirma comanda de compra"
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr "Aquesta és la llista d'albarans generats per aquesta compra"
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr "Compres"
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr "Ref. empresa"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr "Impostos :"
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr "Facturat"
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr "Adreça del destí"
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr "Línia de la comanda de compra"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr "Vista calendari"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr "Canvia a esborrany"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr "Comanda de compra és aprovada pel proveïdor."
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr "Factura esborrany"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr "Comanda de compra"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr "La petició de pressupost és proposat pel sistema."
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr "Factura paquet"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr "Crea factura des de albarà"
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr "Data de la creació d'aquest document."
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr "Albarans & Factures"
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr "Data"
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-"Referència al document que ha generat aquesta sol·licitud de comanda de "
-"compra."
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr "Tel.:"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr "Després de comanda de compra, crea factura."
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr "Data planificada"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr "Nostra referència"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr "IVA:"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr "Calcula"
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "No podeu tenir 2 versions de tarifa que es sobreposin!"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr "Cancel·la comanda de compra"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr "Crea albarà"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr "Total :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr "Quan la comanda de compra és aprovada, crea el seu albarà."
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr "Historial"
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr "Estat de la comanda"
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr "Subtotal"
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr "En espera"
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr "Versió tarifa de compra per defecte"
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Preu un."
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
@@ -688,183 +1229,349 @@ msgid "Fiscal Position"
 msgstr "Posició fiscal"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr "Petició de pressupost Nº"
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr "Factura"
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr "Cancel·la"
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
-msgstr "Propietats de compra"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr "Línies ordre de compra"
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
-msgstr "Ref. comanda"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr "Comandes de compra"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr "Fusiona comandes"
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
 msgstr ""
-"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-"especial!"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
-msgstr "Nova comanda de compra"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
-msgstr "Rebuda"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr "Petició de pressupost"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
-msgstr "Paquet sortint"
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr "Tel.:"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
-msgstr "Controla factures en la recepció"
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr "Nostra referència"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magatzem"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr "Data sol·licitud"
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr "Data aprovació"
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
-msgstr ""
-"Mòdul per a la gestió de compres\n"
-"    Demanar pressupost, crear comanda de compra, crear factura de proveïdor, "
-"imprimir comanda de compra..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
+msgstr "No es pot cancel·lar aquesta comanda de compra!"
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Preu un."
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr "Producte"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr "Descripció"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
-msgstr "Factura recepció producte"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr "Adreça d'enviament prevista:"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
-msgstr "Comanda de compra esperant aprovació"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
-msgstr "Confirmació comanda de compra"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr "Enviament"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr "UdM producte"
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr "Qtat"
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr "Reserva"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
-msgstr "Comanda de compra és confirmada per l'usuari."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
+msgstr "No es pot cancel·lar la comanda de compra!"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
-msgstr "Factura de compra"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr "La vostra referència"
 
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr "Confirmació d'ordre de compra Nº"
-
 #. module: purchase
 #: view:purchase.order:0
-msgid "Total amount"
-msgstr "Import total"
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
+msgstr "Data prevista"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr "IVA:"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr "Data ordenada"
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr "Adreça d'enviament :"
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr "Control de compra"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
-msgstr "Peticions de pressupostos"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr "Tarifa de compra"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -877,14 +1584,32 @@ msgid "Approve"
 msgstr "Aprova"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
-msgstr "Compra aprovada"
+#: view:purchase.order:0
+msgid "To Approve"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
-msgstr "Des d'albarà, crea factura."
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr "Facturació"
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -892,59 +1617,286 @@ msgid "Total"
 msgstr "Total"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr "Esteu segur que voleu fusionar aquestes comandes?"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
-msgstr "Aprovació comanda de compra"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr "CIF/NIF:"
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
-msgstr ""
-"Després de la comanda de compra aprovada, es converteix en factura de "
-"proveïdor"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
-msgstr "Moviments d'estoc"
-
-#. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr "Base imposable"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
+
+#. module: purchase
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr ""
+
+#~ msgid "Supplier Invoice pre-generated on receptions for control"
+#~ msgstr "Factura de proveïdor pre-generada en la recepció per a control"
+
+#~ msgid "Packing"
+#~ msgstr "Paquet/Albarà"
+
+#~ msgid "Confirmed Purchase"
+#~ msgstr "Compra confirmada"
+
+#~ msgid "Create invoice from product recept"
+#~ msgstr "Crea factura des de recepció producte"
+
+#~ msgid "Purchase Process"
+#~ msgstr "Procés de compra"
+
+#~ msgid "Purchase Orders in Progress"
+#~ msgstr "Comandes de compra en procés"
+
+#~ msgid "Purchase order is confirmed by the user."
+#~ msgstr "Comanda de compra és confirmada per l'usuari."
+
+#~ msgid "Purchase Order lines"
+#~ msgstr "Línies de la comanda de compra"
+
+#~ msgid ""
+#~ "From Order: a draft invoice will be pre-generated based on the purchase "
+#~ "order. The accountant will just have to validate this invoice for control.\n"
+#~ "From Picking: a draft invoice will be pre-genearted based on validated "
+#~ "receptions.\n"
+#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
+#~ "manually."
+#~ msgstr ""
+#~ "Des de comanda: Una factura esborrany es pre-generarà basada en la comanda "
+#~ "de compra. El comptable només haurà de validar aquesta factura per a "
+#~ "control.\n"
+#~ "Des de albarà: Una factura esborrany serà pre-generarà basada en les "
+#~ "recepcions validades.\n"
+#~ "Manual: Cap factura es pre-generarà. El comptable haurà de codificar-la "
+#~ "manualment."
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Factura des d'albarans"
+
+#~ msgid "Product Receipt"
+#~ msgstr "Recepció producte"
+
+#~ msgid "Planned Date"
+#~ msgstr "Data prevista"
+
+#~ msgid "Merge purchases"
+#~ msgstr "Fusiona compres"
+
+#~ msgid "When controlling invoice from orders"
+#~ msgstr "Quan es controla factura des de comandes"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invàlid per a la definició de la vista!"
+
+#~ msgid "Pre-generated supplier invoice to control based on order"
+#~ msgstr "Factura de proveïdor pre-generada per a control basada en comanda"
+
+#~ msgid "Invoice from Purchase"
+#~ msgstr "Factura des de compra"
+
+#~ msgid "Packing is created for the products reception control."
+#~ msgstr "Albarà és creat per a el control de recepció de productes."
+
+#~ msgid "Confirming Purchase"
+#~ msgstr "Confirmació compra"
+
+#~ msgid "Approve Purchase order after Confirming"
+#~ msgstr "Aprova comanda de compra després de confirmació"
+
+#~ msgid "Encoded manually by the user."
+#~ msgstr "Codificació manual de l'usuari."
+
+#~ msgid "Purchase orders"
+#~ msgstr "Compres"
+
+#~ msgid "Confirm Purchase Order"
+#~ msgstr "Confirma comanda de compra"
+
+#~ msgid "Partner Ref."
+#~ msgstr "Ref. empresa"
+
+#~ msgid "Purchase order is approved by supplier."
+#~ msgstr "Comanda de compra és aprovada pel proveïdor."
+
+#~ msgid "Purchase order"
+#~ msgstr "Comanda de compra"
+
+#~ msgid "Packing Invoice"
+#~ msgstr "Factura paquet"
+
+#~ msgid "Creates invoice from packin list"
+#~ msgstr "Crea factura des de albarà"
+
+#~ msgid "Delivery & Invoices"
+#~ msgstr "Albarans & Factures"
+
+#~ msgid "After Purchase order , Create invoice."
+#~ msgstr "Després de comanda de compra, crea factura."
+
+#~ msgid "Scheduled date"
+#~ msgstr "Data planificada"
+
+#~ msgid "Create Packing list"
+#~ msgstr "Crea albarà"
+
+#~ msgid "When purchase order is approved , it creates its packing list."
+#~ msgstr "Quan la comanda de compra és aprovada, crea el seu albarà."
+
+#~ msgid "Invoice from Packing list"
+#~ msgstr "Factura des de albarà"
+
+#~ msgid "Order Status"
+#~ msgstr "Estat de la comanda"
+
+#~ msgid "Purchases Properties"
+#~ msgstr "Propietats de compra"
+
+#~ msgid "Order Ref"
+#~ msgstr "Ref. comanda"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+#~ "especial!"
+
+#~ msgid "New Purchase Order"
+#~ msgstr "Nova comanda de compra"
+
+#~ msgid "Out Packing"
+#~ msgstr "Paquet sortint"
+
+#~ msgid "Control invoices on receptions"
+#~ msgstr "Controla factures en la recepció"
+
+#~ msgid "Product recept invoice"
+#~ msgstr "Factura recepció producte"
+
+#~ msgid "Confirming Purchase Order"
+#~ msgstr "Confirmació comanda de compra"
+
+#~ msgid "Purchase Invoice"
+#~ msgstr "Factura de compra"
+
+#~ msgid "Approved Purchase"
+#~ msgstr "Compra aprovada"
+
+#~ msgid "From Packing list, Create invoice."
+#~ msgstr "Des d'albarà, crea factura."
+
+#~ msgid "Approving Purchase Order"
+#~ msgstr "Aprovació comanda de compra"
+
+#~ msgid "After approved purchase order , it comes into the supplier invoice"
+#~ msgstr ""
+#~ "Després de la comanda de compra aprovada, es converteix en factura de "
+#~ "proveïdor"
+
+#~ msgid ""
+#~ "Module for purchase management\n"
+#~ "    Request for quotation, Create Supplier Invoice, Print Order..."
+#~ msgstr ""
+#~ "Mòdul per a la gestió de compres\n"
+#~ "    Demanar pressupost, crear comanda de compra, crear factura de proveïdor, "
+#~ "imprimir comanda de compra..."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom de model no vàlid en la definició de l'acció."
+
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "No podeu tenir 2 versions de tarifa que es sobreposin!"
+
+#~ msgid "Request for quotation is proposed by the system."
+#~ msgstr "La petició de pressupost és proposat pel sistema."
+
+#~ msgid "Request For Quotations"
+#~ msgstr "Peticions de pressupostos"
+
+#~ msgid "Confirm Purchase order from Request for quotation without origin"
+#~ msgstr "Confirma comanda de compra des de petició de pressupost sense origen"
+
+#~ msgid "Confirm Purchase order from Request for quotation"
+#~ msgstr "Confirma comanda de compra des de petició de pressupost"
+
+#~ msgid "Date"
+#~ msgstr "Data"
diff --git a/addons/purchase/i18n/cs.po b/addons/purchase/i18n/cs.po
index a012e5863f9..5ff716c163c 100644
--- a/addons/purchase/i18n/cs.po
+++ b/addons/purchase/i18n/cs.po
@@ -6,29 +6,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-02-03 10:09+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-10-30 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,location_id:0
-msgid "Destination"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
 msgstr ""
 
 #. module: purchase
@@ -37,43 +60,99 @@ msgid "From Picking"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr ""
 
@@ -83,8 +162,16 @@ msgid "Default Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
 msgstr ""
 
 #. module: purchase
@@ -95,15 +182,10 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -112,13 +194,14 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
 msgstr ""
 
 #. module: purchase
@@ -127,20 +210,27 @@ msgid "Approve Purchase"
 msgstr ""
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
 msgstr ""
 
 #. module: purchase
@@ -152,15 +242,26 @@ msgid "Notes"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -168,20 +269,886 @@ msgid "Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr ""
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+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."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr ""
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -193,467 +1160,41 @@ msgid ""
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr ""
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr ""
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr ""
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr ""
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr ""
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
 msgstr ""
 
 #. module: purchase
@@ -662,177 +1203,348 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr ""
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr "Storno"
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
 msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr "Sloučit objednávky(Merge orders)"
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
+#: report:purchase.order:0
+msgid "Tél. :"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
 msgstr ""
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr ""
 
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
-msgid "Total amount"
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
@@ -846,13 +1558,31 @@ msgid "Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
+#: view:purchase.order:0
+msgid "To Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
 msgstr ""
 
 #. module: purchase
@@ -861,59 +1591,97 @@ msgid "Total"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr ""
 "Opravdu chcete tyto obejdnávky sloučit?(Are you sure you want to merge these "
 "orders ?)"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
 msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: view:purchase.order:0
+msgid "Untaxed amount"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
 msgstr ""
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index f068e53eecf..b46d27e2609 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/el.po b/addons/purchase/i18n/el.po
index cf04b041d8c..9587c3225bc 100644
--- a/addons/purchase/i18n/el.po
+++ b/addons/purchase/i18n/el.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-05 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index c7989229c6c..6ea88e11b77 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/i18n/es.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-12 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/es_AR.po b/addons/purchase/i18n/es_AR.po
index 6fc3090f991..5c7868e770b 100644
--- a/addons/purchase/i18n/es_AR.po
+++ b/addons/purchase/i18n/es_AR.po
@@ -6,74 +6,155 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-09-23 15:07+0000\n"
 "Last-Translator: Julieta Catalano <jcatalano@thymbra.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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr "Facturado y Pagado"
 
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
-msgstr "Factura de proveedor pre-generada en la recepción para control"
-
 #. module: purchase
 #: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
 msgid "Destination"
 msgstr "Destino"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+"Debe seleccionar una UdM del producto de la misma categoría que la UdM de "
+"compra del producto"
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
 msgstr "Desde empaque"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr "Dirección destino"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr "Validado por"
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr "Proveedor"
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
-msgstr "de Entrega"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
+msgstr "Sin lista de precio !"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr "Cantidad"
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
-msgstr "Desde Orden"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
+msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
-msgstr "Compra confirmada"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr "Establecer como borrador"
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr "Excepción de factura"
 
@@ -83,9 +164,20 @@ msgid "Default Purchase Pricelist"
 msgstr "Tarifa de compra predeterminada"
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
-msgstr "Crear factura"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr ""
+"Introduzca una dirección si quiere entrgar directamente desde el proveedor "
+"al cliente. En este caso, se eliminará el enlace al almacén y pondrá la "
+"ubicación del cliente."
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -97,15 +189,10 @@ msgstr ""
 "compras de la empresa actual"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr "Fax :"
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr "Crear factura desde recepción producto"
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -117,14 +204,15 @@ msgstr ""
 "seleccionados."
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
-msgstr "Proceso de compra"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
-msgstr "Facturar desde remito"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -132,21 +220,28 @@ msgid "Approve Purchase"
 msgstr "Aprobar Compra"
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr "Aprobado"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
-msgstr "Órdenes de compra en proceso"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Importe sin impuestos"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -157,15 +252,26 @@ msgid "Notes"
 msgstr "notas"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr "Impuestos"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -173,20 +279,890 @@ msgid "Purchase Order"
 msgstr "Orden de compra"
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
-msgstr "Atentamente,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referencia del pedido"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr "Total neto :"
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "Lista de Precios"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr "Excepción de envío"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr "Orígen"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr "Productos entrantes"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr "Corregido manualmente"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr "Precio neto"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "Línea de la orden"
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr "UdM del producto errónea !"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr "Control de factura"
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr "Tel.:"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "Lista de selección"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr "Líneas de la orden"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr "No hay partner !"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr "Fax:"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Error !"
+msgstr "Error !"
+
+#. 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:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr "Aprobada por Proveedor"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr "Desde Orden"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr "Crear factura"
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr "Destino de la reserva"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Acción no válida !"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr "Importe total"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr "Validada por"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr "Factura borrador"
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+"Esto se calcula como la mínima fecha planificada para todos los productos de "
+"las líneas de la orden de compra"
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr "Solicitud de presupuesto :"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr "Orden de compra esperando aprobación"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "Recibido"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr "Ésta es la lista de listas de selección generadas por esta compra"
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr "Gestión de compras"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr "Impuestos :"
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr "Línea de orden de compra"
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr "Vista calendario"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Atentamente,"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Importe sin impuestos"
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr "No hay cuenta de gastos definida para este producto: \"%s\" (id:%d)"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+"Primero debe cancelar todas las facturas asociadas a esta orden de compra."
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "Cancelar orden de compra"
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+"Referencia al documento que ha generado esta solicitud de orden de compra."
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -205,480 +1181,42 @@ msgstr ""
 "convierte en 'Relizada'. Si una acción de cancelación ocurre en la factura o "
 "en la recepción de mercancías, el estado se convierte en 'Excepción'."
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr "Orígen"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr "Productos entrantes"
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr "Ctdad"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr "Corregido manualmente"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr "Referencia"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr "CUIT:"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr "Tel.:"
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr "Líneas de la orden de compra"
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr "Validada por"
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-"Desde la Orden: Una factura borrador se pre-generará basada en la orden de "
-"compra. El contable sólo deberá validar esta factura para control.\n"
-"Desde recepción: Una factura borrador será pre-generará basada en las "
-"recepciones validadas.\n"
-"Manual: Ninguna factura se pre-generará. El contable deberá codificarla "
-"manualmente."
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr "Factura basada en entregas"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr "Precio neto"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr "Línea de la orden"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr "Confirmado"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr "Recibo del producto"
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr "Control de factura"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr "En espera"
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr "Lista de selección"
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr "Líneas de la orden"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr "Confirmar orden de compra desde solicitud de presupuesto sin origen"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr "Fax:"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr "Importe sin impuestos"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr "Fecha prevista"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr "Dirección de envío :"
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr "Lista de precios de compra"
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr "Fecha prevista"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr "Aprobada por Proveedor"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr "Empaque"
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr "Fusionar compras"
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr "Destino de la reserva"
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr "Referencia del pedido"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr "Lista de Precios"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr "Al controlar la factura desde las órdenes"
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista!"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr "Factura de proveedor pre-generada para control basada en la orden"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr "Factura desde la compra"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr "El remito se crea para el control al recibir los productos"
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr "Manual"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr "Confirmación de compra"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr "Aprobar orden de compra después de confirmación"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr "Excepción de envío"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr "Codificación manual por el usuario."
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-"Esto se calcula como la mínima fecha planificada para todos los productos de "
-"las líneas de la orden de compra"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Órdenes de compra"
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-"Introduzca una dirección si quiere entrgar directamente desde el proveedor "
-"al cliente. En este caso, se eliminará el enlace al almacén y pondrá la "
-"ubicación del cliente."
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr "Solicitud de presupuesto :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr "Confirmar orden de compra desde solicitud de presupuesto"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr "Confirmar orden de compra"
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr "Ésta es la lista de listas de selección generadas por esta compra"
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr "Gestión de compras"
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr "Ref. empresa"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr "Impuestos :"
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr "Facturado"
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr "Dirección destino"
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr "Línea de orden de compra"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr "Vista calendario"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr "Establecer como borrador"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr "Orden de compra es aprobado por el proveedor."
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr "Factura borrador"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr "Orden de compra"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr "La solicitud de presupuesto es propuesta por el sistema."
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr "Facturar remito"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr "Crear factura desde remito"
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr "Entregas & Facturas"
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-"Referencia al documento que ha generado esta solicitud de orden de compra."
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr "Tel. :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr "Después de orden de compra, crear factura."
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr "Fecha planificada"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr "Nuestra referencia"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr "IVA:"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr "Calcular"
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr "Cancelar orden de compra"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr "Crear remito"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr "Total :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr "Cuando la orden de compra es aprobado, crea su remito."
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr "Estado de la orden"
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr "Subtotal"
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr "En espera"
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr "Versión de lista de precios de compra predeterminada"
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Precio unitario"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
@@ -686,183 +1224,349 @@ msgid "Fiscal Position"
 msgstr "Posición fiscal"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr ""
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr "Factura"
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
-msgstr "Propiedades de compra"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
-msgstr "Ref. orden"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr "Órdenes de compra"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr "Fusionar órdenes"
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
 msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
-"especial!"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
-msgstr "Nueva orden de compra"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
-msgstr "Recibido"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr "Solicitud de presupuesto"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
-msgstr "Empaque saliente"
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr "Tel. :"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
-msgstr "Controlar facturas en la recepción"
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr "Nuestra referencia"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr "Fecha de solicitud"
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr "Fecha de aprobación"
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
-msgstr ""
-"Módulo para la gestión de compras\n"
-"    Solicitud de presupuesto, crear orden de compra, crear factura de "
-"proveedor, imprimir pedido de compra..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
+msgstr "No se puede cancelar esta orden de compra!"
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unitario"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr "Producto"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr "Descripción"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
-msgstr "Factura recepción del producto"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr "Dirección de entrega prevista :"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
-msgstr "Orden de compra esperando aprobación"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
-msgstr "Confirmación de orden de compra"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr "de Entrega"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr "UdM del producto"
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr "Ctdad"
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr "Reserva"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
-msgstr "Pedido de compra es confirmado por el usuario."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
+msgstr "¡No se puede cancelar la orden de compra!"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
-msgstr "Factura de compra"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr "Su referencia"
 
 #. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
+#: view:purchase.order:0
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
+msgstr "Fecha prevista"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Total amount"
-msgstr "Importe total"
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr "IVA:"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr "Fecha ordenada"
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío :"
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr "Control de compra"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
-msgstr "Solicitud de Presupuestos"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr "Lista de precios de compra"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -875,14 +1579,32 @@ msgid "Approve"
 msgstr "Aprobar"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
-msgstr "Compra aprobada"
+#: view:purchase.order:0
+msgid "To Approve"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
-msgstr "Desde remito, crear factura."
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -890,109 +1612,281 @@ msgid "Total"
 msgstr "Total"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr "¿Está seguro que quiere fusionar estas órdenes?"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
-msgstr "Aprobación de orden de compra"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr "CUIT:"
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
-msgstr ""
-"Después de que la orden de compra es aprobada, se convierte en factura de "
-"proveedor"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr "Importe sin impuestos"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
 msgstr ""
 
-#, python-format
-#~ msgid "No Pricelist !"
-#~ msgstr "Sin lista de precio !"
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr ""
 
-#, python-format
-#~ msgid "You must first cancel all invoices attached to this purchase order."
-#~ msgstr ""
-#~ "Primero debe cancelar todas las facturas asociadas a esta orden de compra."
+#~ msgid "Supplier Invoice pre-generated on receptions for control"
+#~ msgstr "Factura de proveedor pre-generada en la recepción para control"
 
-#, python-format
-#~ msgid "Wrong Product UOM !"
-#~ msgstr "UdM del producto errónea !"
+#~ msgid "Packing"
+#~ msgstr "Empaque"
 
-#, python-format
-#~ msgid "Invalid action !"
-#~ msgstr "Acción no válida !"
+#~ msgid "Purchase Process"
+#~ msgstr "Proceso de compra"
 
-#, python-format
-#~ msgid "Error !"
-#~ msgstr "Error !"
+#~ msgid "Confirmed Purchase"
+#~ msgstr "Compra confirmada"
+
+#~ msgid "Create invoice from product recept"
+#~ msgstr "Crear factura desde recepción producto"
+
+#~ msgid "Purchase Orders in Progress"
+#~ msgstr "Órdenes de compra en proceso"
 
-#, python-format
 #~ msgid ""
-#~ "You have to select a product UOM in the same category than the purchase UOM "
-#~ "of the product"
+#~ "From Order: a draft invoice will be pre-generated based on the purchase "
+#~ "order. The accountant will just have to validate this invoice for control.\n"
+#~ "From Picking: a draft invoice will be pre-genearted based on validated "
+#~ "receptions.\n"
+#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
+#~ "manually."
 #~ msgstr ""
-#~ "Debe seleccionar una UdM del producto de la misma categoría que la UdM de "
-#~ "compra del producto"
+#~ "Desde la Orden: Una factura borrador se pre-generará basada en la orden de "
+#~ "compra. El contable sólo deberá validar esta factura para control.\n"
+#~ "Desde recepción: Una factura borrador será pre-generará basada en las "
+#~ "recepciones validadas.\n"
+#~ "Manual: Ninguna factura se pre-generará. El contable deberá codificarla "
+#~ "manualmente."
 
-#, python-format
-#~ msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
-#~ msgstr "No hay cuenta de gastos definida para este producto: \"%s\" (id:%d)"
+#~ msgid "Purchase Order lines"
+#~ msgstr "Líneas de la orden de compra"
 
-#, python-format
-#~ msgid "Could not cancel this purchase order !"
-#~ msgstr "No se puede cancelar esta orden de compra!"
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Factura basada en entregas"
 
-#, python-format
-#~ msgid "No Partner!"
-#~ msgstr "No hay partner !"
+#~ msgid "Confirm Purchase order from Request for quotation without origin"
+#~ msgstr "Confirmar orden de compra desde solicitud de presupuesto sin origen"
 
-#, python-format
-#~ msgid "Could not cancel purchase order !"
-#~ msgstr "¡No se puede cancelar la orden de compra!"
+#~ msgid "Product Receipt"
+#~ msgstr "Recibo del producto"
+
+#~ msgid "Planned Date"
+#~ msgstr "Fecha prevista"
+
+#~ msgid "Merge purchases"
+#~ msgstr "Fusionar compras"
+
+#~ msgid "Confirming Purchase"
+#~ msgstr "Confirmación de compra"
+
+#~ msgid "When controlling invoice from orders"
+#~ msgstr "Al controlar la factura desde las órdenes"
+
+#~ msgid "Pre-generated supplier invoice to control based on order"
+#~ msgstr "Factura de proveedor pre-generada para control basada en la orden"
+
+#~ msgid "Packing is created for the products reception control."
+#~ msgstr "El remito se crea para el control al recibir los productos"
+
+#~ msgid "Invoice from Purchase"
+#~ msgstr "Factura desde la compra"
+
+#~ msgid "Approve Purchase order after Confirming"
+#~ msgstr "Aprobar orden de compra después de confirmación"
+
+#~ msgid "Purchase orders"
+#~ msgstr "Órdenes de compra"
+
+#~ msgid "Encoded manually by the user."
+#~ msgstr "Codificación manual por el usuario."
+
+#~ msgid "Confirm Purchase Order"
+#~ msgstr "Confirmar orden de compra"
+
+#~ msgid "Confirm Purchase order from Request for quotation"
+#~ msgstr "Confirmar orden de compra desde solicitud de presupuesto"
+
+#~ msgid "Partner Ref."
+#~ msgstr "Ref. empresa"
+
+#~ msgid "Purchase order"
+#~ msgstr "Orden de compra"
+
+#~ msgid "Request for quotation is proposed by the system."
+#~ msgstr "La solicitud de presupuesto es propuesta por el sistema."
+
+#~ msgid "Creates invoice from packin list"
+#~ msgstr "Crear factura desde remito"
+
+#~ msgid "Purchase order is approved by supplier."
+#~ msgstr "Orden de compra es aprobado por el proveedor."
+
+#~ msgid "Delivery & Invoices"
+#~ msgstr "Entregas & Facturas"
+
+#~ msgid "Scheduled date"
+#~ msgstr "Fecha planificada"
+
+#~ msgid "Create Packing list"
+#~ msgstr "Crear remito"
+
+#~ msgid "After Purchase order , Create invoice."
+#~ msgstr "Después de orden de compra, crear factura."
+
+#~ msgid "Invoice from Packing list"
+#~ msgstr "Facturar desde remito"
+
+#~ msgid "Order Ref"
+#~ msgstr "Ref. orden"
+
+#~ msgid "Order Status"
+#~ msgstr "Estado de la orden"
+
+#~ msgid "Purchases Properties"
+#~ msgstr "Propiedades de compra"
+
+#~ msgid "Control invoices on receptions"
+#~ msgstr "Controlar facturas en la recepción"
+
+#~ msgid "Out Packing"
+#~ msgstr "Empaque saliente"
+
+#~ msgid "New Purchase Order"
+#~ msgstr "Nueva orden de compra"
+
+#~ msgid ""
+#~ "Module for purchase management\n"
+#~ "    Request for quotation, Create Supplier Invoice, Print Order..."
+#~ msgstr ""
+#~ "Módulo para la gestión de compras\n"
+#~ "    Solicitud de presupuesto, crear orden de compra, crear factura de "
+#~ "proveedor, imprimir pedido de compra..."
+
+#~ msgid "Product recept invoice"
+#~ msgstr "Factura recepción del producto"
+
+#~ msgid "Confirming Purchase Order"
+#~ msgstr "Confirmación de orden de compra"
+
+#~ msgid "Request For Quotations"
+#~ msgstr "Solicitud de Presupuestos"
+
+#~ msgid "Purchase Invoice"
+#~ msgstr "Factura de compra"
+
+#~ msgid "From Packing list, Create invoice."
+#~ msgstr "Desde remito, crear factura."
+
+#~ msgid "After approved purchase order , it comes into the supplier invoice"
+#~ msgstr ""
+#~ "Después de que la orden de compra es aprobada, se convierte en factura de "
+#~ "proveedor"
+
+#~ msgid "Approving Purchase Order"
+#~ msgstr "Aprobación de orden de compra"
+
+#~ msgid "Approved Purchase"
+#~ msgstr "Compra aprobada"
+
+#~ msgid "Packing Invoice"
+#~ msgstr "Facturar remito"
+
+#~ msgid "When purchase order is approved , it creates its packing list."
+#~ msgstr "Cuando la orden de compra es aprobado, crea su remito."
 
 #, python-format
 #~ msgid "You must first cancel all packing attached to this purchase order."
 #~ msgstr ""
 #~ "Primero debe cancelar todos los remitos asociados a esta orden de compra."
+
+#~ msgid "Purchase order is confirmed by the user."
+#~ msgstr "Pedido de compra es confirmado por el usuario."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
+#~ "especial!"
diff --git a/addons/purchase/i18n/es_EC.po b/addons/purchase/i18n/es_EC.po
index 79dd8afd3b7..d786106243a 100644
--- a/addons/purchase/i18n/es_EC.po
+++ b/addons/purchase/i18n/es_EC.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-23 02:28+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@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-24 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -35,11 +35,6 @@ msgstr ""
 msgid "Invoiced & Paid"
 msgstr "Facturada & Pagada (conciliada)"
 
-#. module: purchase
-#: report:purchase.quotation:0
-msgid "Regards,"
-msgstr "Recuerdos,"
-
 #. module: purchase
 #: field:purchase.order,location_id:0
 #: view:purchase.report:0
@@ -76,11 +71,6 @@ msgstr "Dirección destinatario"
 msgid "Validated By"
 msgstr "Validado por"
 
-#. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
 #. module: purchase
 #: view:purchase.order:0
 #: field:purchase.order,partner_id:0
@@ -493,16 +483,14 @@ msgid "Invoice Control"
 msgstr "Control factura"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Request for Quotations."
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr "Petición presupuesto"
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -576,11 +564,6 @@ msgstr "Precio Total"
 msgid "To be Invoiced"
 msgstr ""
 
-#. module: purchase
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
 msgid "Address Contact Name"
@@ -630,11 +613,6 @@ msgid ""
 "negotiation performance, the delivery performance of your suppliers, etc."
 msgstr ""
 
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "¡No puede tener 2 versiones de tarifa que se solapen!"
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved by Supplier"
@@ -709,9 +687,10 @@ msgid "Validated by"
 msgstr "Validada por"
 
 #. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "Petición presupuesto"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
@@ -736,11 +715,6 @@ msgstr ""
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
 
-#. module: purchase
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Manual"
@@ -848,22 +822,10 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.order,state:0
-msgid ""
-"The state of the purchase order or the quotation request. A quotation is a "
-"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
-"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
-"order to change the state to 'Approved'. When the purchase order is paid and "
-"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
-"or in the reception of goods, the state becomes in exception."
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
 msgstr ""
-"El estado del pedido de compra o de la solicitud de presupuesto. Un "
-"presupuesto es un pedido de compra en estado 'Borrador'. Entonces, si el "
-"pedido es confirmado por el usuario, el estado cambiará a 'Confirmado'. "
-"Entonces el proveedor debe confirmar el pedido para cambiar el estado a "
-"'Aprobado'. Cuando el pedido de compra está pagado y recibido, el estado se "
-"convierte en 'Relizado'. Si una acción de cancelación ocurre en la factura o "
-"en la recepción de mercancías, el estado se convierte en 'Excepción'."
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -881,11 +843,6 @@ msgstr "Pedido de compra esperando aprobación"
 msgid "Total Untaxed amount"
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "The supplier approves the Purchase Order."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,shipped:0
 #: field:purchase.order,shipped_rate:0
@@ -966,6 +923,11 @@ msgstr ""
 msgid "Purchase Order Line"
 msgstr "Línea pedido de compra"
 
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Calendar View"
@@ -977,12 +939,11 @@ msgid "Purchase Order Merge"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Recuerdos,"
 
 #. module: purchase
-#: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
 #: view:purchase.report:0
 msgid "Negotiation by Supplier"
@@ -1029,6 +990,11 @@ msgstr ""
 msgid "Qty. per product"
 msgstr ""
 
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -1044,11 +1010,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: purchase
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
@@ -1140,8 +1101,8 @@ msgid "Cancel Purchase Order"
 msgstr "Cancelar pedido de compra"
 
 #. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Supplier Reference"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
 msgstr ""
 
 #. module: purchase
@@ -1160,13 +1121,6 @@ msgstr ""
 msgid "Products Value"
 msgstr ""
 
-#. module: purchase
-#: constraint:product.pricelist.item:0
-msgid ""
-"Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
-"Item!"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
@@ -1207,9 +1161,22 @@ msgstr ""
 "Referencia al documento que ha generado esta solicitud de pedido de compra."
 
 #. module: purchase
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
+#: help:purchase.order,state:0
+msgid ""
+"The state of the purchase order or the quotation request. A quotation is a "
+"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
+"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
+"order to change the state to 'Approved'. When the purchase order is paid and "
+"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
+"or in the reception of goods, the state becomes in exception."
 msgstr ""
+"El estado del pedido de compra o de la solicitud de presupuesto. Un "
+"presupuesto es un pedido de compra en estado 'Borrador'. Entonces, si el "
+"pedido es confirmado por el usuario, el estado cambiará a 'Confirmado'. "
+"Entonces el proveedor debe confirmar el pedido para cambiar el estado a "
+"'Aprobado'. Cuando el pedido de compra está pagado y recibido, el estado se "
+"convierte en 'Relizado'. Si una acción de cancelación ocurre en la factura o "
+"en la recepción de mercancías, el estado se convierte en 'Excepción'."
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
@@ -1286,8 +1253,8 @@ msgid "Purchase Order Lines"
 msgstr ""
 
 #. module: purchase
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
 msgstr ""
 
 #. module: purchase
@@ -1308,14 +1275,6 @@ msgstr ""
 msgid "Merge orders"
 msgstr "Fusionar pedidos"
 
-#. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
@@ -1368,6 +1327,12 @@ msgstr ""
 msgid "Warehouse"
 msgstr "Almacén"
 
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
 #. module: purchase
 #: report:purchase.order:0
 msgid "Date Req."
@@ -1385,12 +1350,6 @@ msgstr "Fecha aprobación"
 msgid "Could not cancel this purchase order !"
 msgstr ""
 
-#. module: purchase
-#: selection:purchase.order,state:0
-#: selection:purchase.report,state:0
-msgid "Waiting Supplier Ack"
-msgstr ""
-
 #. module: purchase
 #: report:purchase.order:0
 #: field:purchase.order.line,price_unit:0
@@ -1654,11 +1613,6 @@ msgstr "Total"
 msgid "Addresses"
 msgstr ""
 
-#. module: purchase
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index 881300125df..a8095a6b203 100644
--- a/addons/purchase/i18n/et.po
+++ b/addons/purchase/i18n/et.po
@@ -6,24 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-28 08:37+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-10-30 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
-msgstr "Tellimusest"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
+msgstr "Hinnakiri puudub !"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -32,11 +35,34 @@ msgstr "Ostutukorraldus"
 
 #. module: purchase
 #: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
 msgid "Order Reference"
 msgstr "Tellimuse viide"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: 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 ""
+"Sa pead valima partneri ostuvormil!\n"
+"Palun määra partner enne toote valimist."
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr "Tellimusest"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Vigane tegevus !"
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Our Order Reference"
 msgstr "Meie tellimuse viide"
 
@@ -46,74 +72,147 @@ msgid "Reservation"
 msgstr "Reserveerimine"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr "Sinu tellimuse viide"
 
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
-msgstr "Hinnapäringud"
-
 #. module: purchase
 #: field:purchase.order,invoice_method:0
 msgid "Invoicing Control"
 msgstr "Arveldamishaldus"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr "Arveldatud ja makstud"
 
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
-msgstr "Vastuvõtmistel kontrolliks eelgenereeritud tarnija arve"
-
 #. module: purchase
 #: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
 msgid "Destination"
 msgstr "Sihtpunkt"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+"Sa pead valima toote mõõtühiku samast kategooriast, mis toote ostu mõõtõhik."
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
 msgstr "Noppest"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr "Sihtkoha aadress"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr "Valideerija:"
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr "Tarnija"
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
-msgstr "Tarnimine"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr "Kogus"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
-msgstr "Kinnitatud ost"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr "Määra mustandiks"
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr "Arve erand"
 
@@ -123,9 +222,19 @@ msgid "Default Purchase Pricelist"
 msgstr "Vaikimisi ostu hinnakiri"
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
-msgstr "Loo arve"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr ""
+"Sisesta aadress, kui sa tahad kättetoimetamist tarnijalt otse kliendile. Sel "
+"juhul eemaldame me laohoone viida ja määrame kliendi asukoha."
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -137,15 +246,10 @@ msgstr ""
 "käesolevalt partnerilt."
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr "Faks :"
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr "Loo arve toote vastuvõtmisest"
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -156,14 +260,15 @@ msgstr ""
 "arvutab see tarnija hinna valitud toodetele/kogustele."
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
-msgstr "Ostuprotseduur"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
-msgstr "Arve pakkelehelt"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -171,21 +276,28 @@ msgid "Approve Purchase"
 msgstr "Kiida ost heaks"
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr "Heaks kiidetud"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
-msgstr "Ostukorraldused töötlemisel"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Maksuvaba summa"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr "Lao liikumised"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -196,27 +308,880 @@ msgid "Notes"
 msgstr "Märkused"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr "Maksud"
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
-msgstr "Tervitades,"
-
-#. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr "Netosumma:"
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr "Tühistatud"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "Hinnakiri"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr "Tarne erand"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr "Päritolu"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr "Sissetulevad Tooted"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr "Parandatud käsitsi"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr "Viide"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Analüütiline konto"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr "Netohind"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "Korralduse rida"
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr "Vale toote MÜ!"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr "Kinnitatud"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr "Kokku :"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr "Kinnita"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr "Arvehaldus"
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr "Tel.:"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "Noppeleht"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr "Korralduse read"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr "Puudub partner!"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr "Faks:"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr "Hind kokku"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Error !"
+msgstr "Viga !"
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr "Heaks kiidetud tarnija poolt"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr "Loo arve"
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr "Reserveeringu sihtkoht"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr "Valmis"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr "Kogusumma"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr "Valideerija:"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "Noteerimisnõue"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr "Käsitsi"
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr "Arve mustand"
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+"See on arvutatud kui kõigi ostukorralduse ridade toodete minimaalne "
+"planeeritud kuupäev."
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr "Hinnapäring"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr "Ostukorraldused mis ootavad heaks kiitmist"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "Vastu võetud"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr "See on noppelehe nimekiri, mis on genereeritud selle ostu jaoks."
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr "Ostuhaldus"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr "Maksud :"
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Arveldatud"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr "Ostukorralduse rida"
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr "Kalendrivaade"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Tervitades,"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Maksuvaba summa"
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr "Sellele tootele pole määratud kulukontot: \"%s\" (id:%d)"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+"Sa pead kõigepealt tühistama kõik arved, mis on lisatud sellele "
+"ostukorraldusele."
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr "Arvuta"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "Tühista ostukorraldus"
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr "Ajalugu"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr "Viide dokumendile, mis genereeris selle ostukorralduse päringu."
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -235,646 +1200,409 @@ msgstr ""
 "'Hälve'."
 
 #. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr "Päritolu"
+#: field:purchase.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Vahesumma"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr "Sissetulevad Tooted"
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr "Kogus"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr "Parandatud käsitsi"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr "Viide"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr "KM :"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr "Tel.:"
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr "Analüütiline konto"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr "Ostukorralduse read"
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr "Valideerija:"
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
 msgstr ""
-"Korraldusest: mustandarve eelgenereeritakse ostukorralduse põhjal. "
-"Raamatupidaja peab lihtsalt valideerima selle arve kontrolliks.\n"
-"Noppest: mustandarve eelgenereeritakse valideeritud vastuvõtmiste põhjal.\n"
-"Manuaalne: arvet ei eelgenereerita. Raamatupidaja peab kodeerima manuaalselt."
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr "Arve kättetoimetamiste põhjal"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr "Netohind"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr "Korralduse rida"
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr "Kinnitatud"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr "Toote kviitung"
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr "Kinnita"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr "Arvehaldus"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr "Noteerimisnõue"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Waiting"
 msgstr "Ootel"
 
 #. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr "Noppeleht"
+#: model:product.pricelist.version,name:purchase.ver0
+msgid "Default Purchase Pricelist Version"
+msgstr "Vaikimisi ostuhinnakirja versioon"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Finantspositsioon"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Request for Quotation N°"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
+#: field:purchase.order,invoice_id:0
+msgid "Invoice"
+msgstr "Arve"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
+#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
+msgid "Cancel"
+msgstr "Tühista"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
+#: model:ir.actions.act_window,name:purchase.purchase_form_action
+#: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
+msgid "Purchase Orders"
+msgstr "Ostukorraldused"
+
+#. module: purchase
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid "Merge orders"
+msgstr "Ühenda tellimused"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Request for Quotation"
+msgstr "Hinnapäring"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr "Tel. :"
+
+#. module: purchase
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
 msgid "Warehouse"
 msgstr "Ladu"
 
 #. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr "Korralduse read"
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr "Kinnita ostukorraldus päritoluta hinnapäringust."
+#: report:purchase.order:0
+msgid "Date Req."
+msgstr "Nõutud aeg"
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr "Faks:"
+#: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
+msgid "Date Approved"
+msgstr "Heaks kiitmise kuupäev"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
+msgstr "Seda ostukorraldust ei saa tühistada !"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Ühiku hind"
 
 #. module: purchase
 #: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr "Maksuvaba summa"
+msgid "Delivery & Invoicing"
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
+msgid "Product"
+msgstr "Toode"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,name:0
+#: report:purchase.quotation:0
+msgid "Description"
+msgstr "Kirjeldus"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Expected Delivery address:"
+msgstr "Eeldatav kättetoimetamise aadress:"
+
+#. module: purchase
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr "Tarnimine"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
+msgid "Product UOM"
+msgstr "Toote MÜ"
+
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr "Kogus"
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
+msgstr "Ostukorraldust ei saa tühistada !"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
 msgid "Expected Date"
 msgstr "Oodatav kuupäev"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr "KM:"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
+msgid "Date Ordered"
+msgstr "Tellimise kuupäev"
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Shipping address :"
 msgstr "Tarneaadress :"
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase Control"
+msgstr "Ostuhaldus"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
 #: field:res.partner,property_product_pricelist_purchase:0
 msgid "Purchase Pricelist"
 msgstr "Ostuhinnakiri"
 
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr "Planeeritud kuupäev"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr "Heaks kiidetud tarnija poolt"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr "Pakkimine"
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr "Ühenda ostud"
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr "Reserveeringu sihtkoht"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr "Valmis"
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr "Hinnakiri"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr "Kontrollides arveid korraldustest"
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr "Korralduse põhjal eelgenereeritud tarnija arve kontrolliks"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr "Ostuarve"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr "Pakkeleht luuakse toodete vastuvõtmise kontrollimiseks."
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr "Käsitsi"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr "Kinnita ost"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr "Kiida ostukorraldus heaks peale kinnitamist"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr "Tarne erand"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr "Kodeeritud manuaalselt kasutaja poolt."
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-"See on arvutatud kui kõigi ostukorralduse ridade toodete minimaalne "
-"planeeritud kuupäev."
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Ostukorraldused"
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-"Sisesta aadress, kui sa tahad kättetoimetamist tarnijalt otse kliendile. Sel "
-"juhul eemaldame me laohoone viida ja määrame kliendi asukoha."
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr "Hinnapäring"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr "Kinnita ostukorraldus hinnapäringust"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr "Kinnita ostukorraldus"
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr "See on noppelehe nimekiri, mis on genereeritud selle ostu jaoks."
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr "Ostuhaldus"
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr "Partneri viide."
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr "Maksud :"
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr "Arveldatud"
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr "Sihtkoha aadress"
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr "Ostukorralduse rida"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr "Kalendrivaade"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr "Määra mustandiks"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr "Ostukorraldus on heaks kiidetud tarnija poolt."
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr "Arve mustand"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr "Ostukorraldus"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr "Hinnapäringut pakutakse süsteemi poolt"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr "Pakkimise arve"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr "Loob arve pakkelehelt"
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr "Kättetoimetamine ja arved"
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr "Kuupäev"
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr "Viide dokumendile, mis genereeris selle ostukorralduse päringu."
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr "Tel. :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr "Pärast ostukorraldust loo arve."
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr "Planeeritud kuupäev"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr "KM:"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr "Arvuta"
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "Sul ei saa olla 2 hinnakirja versiooni, mis kattuvad!"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr "Tühista ostukorraldus"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr "Loo pakkeleht"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr "Kokku :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr "Kui ostukorraldus on heaks kiidetud, loob see pakkimise nimekirja."
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr "Ajalugu"
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr "Korralduse staatus"
-
-#. module: purchase
-#: field:purchase.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Vahesumma"
-
-#. module: purchase
-#: model:product.pricelist.version,name:purchase.ver0
-msgid "Default Purchase Pricelist Version"
-msgstr "Vaikimisi ostuhinnakirja versioon"
-
-#. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Ühiku hind"
-
-#. module: purchase
-#: field:purchase.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Finantspositsioon"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Request for Quotation N°"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,invoice_id:0
-msgid "Invoice"
-msgstr "Arve"
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
-#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
-msgid "Cancel"
-msgstr "Tühista"
-
-#. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
-msgstr "Ostude omadused"
-
-#. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
-msgstr "Korralduse viide"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action
-msgid "Purchase Orders"
-msgstr "Ostukorraldused"
-
-#. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
-msgid "Merge orders"
-msgstr "Ühenda tellimused"
-
-#. module: purchase
-#: 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: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
-msgstr "Uus ostukorraldus"
-
-#. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
-msgstr "Vastu võetud"
-
-#. module: purchase
-#: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
-#: selection:purchase.order,state:0
-msgid "Request for Quotation"
-msgstr "Hinnapäring"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
-msgstr "Halda arveid vastuvõtmisel"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Date Req."
-msgstr "Nõutud aeg"
-
-#. module: purchase
-#: field:purchase.order,date_approve:0
-msgid "Date Approved"
-msgstr "Heaks kiitmise kuupäev"
-
-#. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
-msgstr ""
-"Moodul ostuhalduseks\n"
-"    Hinnapäringud, Tarnija arvete loomine, Korralduste printimine..."
-
-#. module: purchase
-#: field:purchase.order.line,product_id:0
-msgid "Product"
-msgstr "Toode"
-
-#. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
-msgid "Description"
-msgstr "Kirjeldus"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
-msgstr "Toote kviitungi arve"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Delivery address:"
-msgstr "Eeldatav kättetoimetamise aadress:"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
-msgstr "Ostukorraldused mis ootavad heaks kiitmist"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
-msgstr "Kinnitan ostukorralduse"
-
-#. module: purchase
-#: field:purchase.order.line,product_uom:0
-msgid "Product UOM"
-msgstr "Toote MÜ"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
-msgstr "Ostukorraldus on kinnitatud kasutaja poolt."
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
-msgstr "Ostuarve"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Total amount"
-msgstr "Kogusumma"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Date Ordered"
-msgstr "Tellimise kuupäev"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Purchase Control"
-msgstr "Ostuhaldus"
-
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
 msgid "Approve"
 msgstr "Nõustu"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
-msgstr "Heaks kiidetud ost"
+#: view:purchase.order:0
+msgid "To Approve"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
-msgstr "Loo arve pakkelehest"
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -882,57 +1610,288 @@ msgid "Total"
 msgstr "Kokku"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr "Oled kindel, et tahad ühendada need korraldused ?"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
-msgstr "Kiidan heaks ostukorralduse"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr "KM :"
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
-msgstr "Peale ostukorralduse heaks kiitmist läheb see kliendiarveks"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
-msgstr "Lao liikumised"
-
-#. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
-msgstr "Ootegraafik"
-
-#. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
-msgstr "Hind kokku"
-
-#. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
-msgstr "Hinnapakkumine"
-
-#. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
-msgstr "Edenemisel käsitsi"
-
-#. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
-msgstr "Hetkel toimumas"
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "title"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr "Maksuvaba summa"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr ""
+
+#~ msgid "Product recept invoice"
+#~ msgstr "Toote kviitungi arve"
+
+#~ msgid "Confirmed Purchase"
+#~ msgstr "Kinnitatud ost"
+
+#~ msgid "Purchase Process"
+#~ msgstr "Ostuprotseduur"
+
+#~ msgid "Planned Date"
+#~ msgstr "Planeeritud kuupäev"
+
+#~ msgid "Merge purchases"
+#~ msgstr "Ühenda ostud"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Vigane XML vaate arhitektuurile!"
+
+#~ msgid "Invoice from Purchase"
+#~ msgstr "Ostuarve"
+
+#~ msgid "Confirming Purchase"
+#~ msgstr "Kinnita ost"
+
+#~ msgid "Partner Ref."
+#~ msgstr "Partneri viide."
+
+#~ msgid "Purchases Properties"
+#~ msgstr "Ostude omadused"
+
+#~ 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 "Confirming Purchase Order"
+#~ msgstr "Kinnitan ostukorralduse"
+
+#~ msgid "Purchase Invoice"
+#~ msgstr "Ostuarve"
+
+#~ msgid "Approving Purchase Order"
+#~ msgstr "Kiidan heaks ostukorralduse"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
+
+#~ msgid "Supplier Invoice pre-generated on receptions for control"
+#~ msgstr "Vastuvõtmistel kontrolliks eelgenereeritud tarnija arve"
+
+#~ msgid "Packing"
+#~ msgstr "Pakkimine"
+
+#~ msgid "Product Receipt"
+#~ msgstr "Toote kviitung"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Arve kättetoimetamiste põhjal"
+
+#~ msgid ""
+#~ "From Order: a draft invoice will be pre-generated based on the purchase "
+#~ "order. The accountant will just have to validate this invoice for control.\n"
+#~ "From Picking: a draft invoice will be pre-genearted based on validated "
+#~ "receptions.\n"
+#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
+#~ "manually."
+#~ msgstr ""
+#~ "Korraldusest: mustandarve eelgenereeritakse ostukorralduse põhjal. "
+#~ "Raamatupidaja peab lihtsalt valideerima selle arve kontrolliks.\n"
+#~ "Noppest: mustandarve eelgenereeritakse valideeritud vastuvõtmiste põhjal.\n"
+#~ "Manuaalne: arvet ei eelgenereerita. Raamatupidaja peab kodeerima manuaalselt."
+
+#~ msgid "Pre-generated supplier invoice to control based on order"
+#~ msgstr "Korralduse põhjal eelgenereeritud tarnija arve kontrolliks"
+
+#~ msgid "Packing is created for the products reception control."
+#~ msgstr "Pakkeleht luuakse toodete vastuvõtmise kontrollimiseks."
+
+#~ msgid "Confirm Purchase order from Request for quotation"
+#~ msgstr "Kinnita ostukorraldus hinnapäringust"
+
+#~ msgid "Encoded manually by the user."
+#~ msgstr "Kodeeritud manuaalselt kasutaja poolt."
+
+#~ msgid "Scheduled date"
+#~ msgstr "Planeeritud kuupäev"
+
+#~ msgid "Delivery & Invoices"
+#~ msgstr "Kättetoimetamine ja arved"
+
+#~ msgid "Creates invoice from packin list"
+#~ msgstr "Loob arve pakkelehelt"
+
+#~ msgid "Packing Invoice"
+#~ msgstr "Pakkimise arve"
+
+#~ msgid "Control invoices on receptions"
+#~ msgstr "Halda arveid vastuvõtmisel"
+
+#~ msgid "Invoice from Packing list"
+#~ msgstr "Arve pakkelehelt"
+
+#~ msgid "Create Packing list"
+#~ msgstr "Loo pakkeleht"
+
+#~ msgid "From Packing list, Create invoice."
+#~ msgstr "Loo arve pakkelehest"
+
+#~ msgid "Create invoice from product recept"
+#~ msgstr "Loo arve toote vastuvõtmisest"
+
+#~ msgid "When controlling invoice from orders"
+#~ msgstr "Kontrollides arveid korraldustest"
+
+#~ msgid "Request for quotation is proposed by the system."
+#~ msgstr "Hinnapäringut pakutakse süsteemi poolt"
+
+#~ msgid "Approved Purchase"
+#~ msgstr "Heaks kiidetud ost"
+
+#~ msgid "When purchase order is approved , it creates its packing list."
+#~ msgstr "Kui ostukorraldus on heaks kiidetud, loob see pakkimise nimekirja."
+
+#~ msgid "After approved purchase order , it comes into the supplier invoice"
+#~ msgstr "Peale ostukorralduse heaks kiitmist läheb see kliendiarveks"
+
+#~ msgid ""
+#~ "Module for purchase management\n"
+#~ "    Request for quotation, Create Supplier Invoice, Print Order..."
+#~ msgstr ""
+#~ "Moodul ostuhalduseks\n"
+#~ "    Hinnapäringud, Tarnija arvete loomine, Korralduste printimine..."
+
+#~ msgid "Confirm Purchase order from Request for quotation without origin"
+#~ msgstr "Kinnita ostukorraldus päritoluta hinnapäringust."
+
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "Sul ei saa olla 2 hinnakirja versiooni, mis kattuvad!"
+
+#~ msgid "Approve Purchase order after Confirming"
+#~ msgstr "Kiida ostukorraldus heaks peale kinnitamist"
+
+#~ msgid "Purchase Order lines"
+#~ msgstr "Ostukorralduse read"
+
+#~ msgid "Purchase order is confirmed by the user."
+#~ msgstr "Ostukorraldus on kinnitatud kasutaja poolt."
+
+#~ msgid "After Purchase order , Create invoice."
+#~ msgstr "Pärast ostukorraldust loo arve."
+
+#~ msgid "Confirm Purchase Order"
+#~ msgstr "Kinnita ostukorraldus"
+
+#~ msgid "Order Status"
+#~ msgstr "Korralduse staatus"
+
+#~ msgid "Order Ref"
+#~ msgstr "Korralduse viide"
+
+#~ msgid "Purchase orders"
+#~ msgstr "Ostukorraldused"
+
+#~ msgid "Purchase order is approved by supplier."
+#~ msgstr "Ostukorraldus on heaks kiidetud tarnija poolt."
+
+#~ msgid "Purchase order"
+#~ msgstr "Ostukorraldus"
+
+#~ msgid "New Purchase Order"
+#~ msgstr "Uus ostukorraldus"
+
+#~ msgid "Purchase Orders in Progress"
+#~ msgstr "Ostukorraldused töötlemisel"
+
+#~ msgid "Request For Quotations"
+#~ msgstr "Hinnapäringud"
+
+#~ msgid "Date"
+#~ msgstr "Kuupäev"
+
+#~ msgid "Quotation"
+#~ msgstr "Hinnapakkumine"
+
+#~ msgid "In progress"
+#~ msgstr "Hetkel toimumas"
+
+#~ msgid "Waiting Schedule"
+#~ msgstr "Ootegraafik"
+
+#~ msgid "Manual in progress"
+#~ msgstr "Edenemisel käsitsi"
diff --git a/addons/purchase/i18n/fi.po b/addons/purchase/i18n/fi.po
index 0de4c43224a..966b3946aeb 100644
--- a/addons/purchase/i18n/fi.po
+++ b/addons/purchase/i18n/fi.po
@@ -7,74 +7,155 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 10:09+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Finnish <fi@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:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr "Laskutettu ja maksettu"
 
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
-msgstr "Toimittajan lasku ennakoluotu vastaanotettaessa kontrollia varten"
-
 #. module: purchase
 #: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
 msgid "Destination"
 msgstr "Kohde"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+"Tuotteen mittayksikkö täytyy olla samassa kategoriassa kuin ostojen "
+"mittayksikkö tälle tuotteelle"
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
 msgstr "Vastaanotossa"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr "Määränpään osoite"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr "Hyväksyjä"
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr "Toimittaja"
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
-msgstr "Toimitus"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
+msgstr "Ei hinnastoa!"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr "Määrä"
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
-msgstr "Tilauksesta"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
+msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
-msgstr "Vahvistettu ostotilaus"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr "Aseta luonnokseksi"
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr "Poikkeus laskussa"
 
@@ -84,9 +165,20 @@ msgid "Default Purchase Pricelist"
 msgstr "Oletushinnasto ostoille"
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
-msgstr "Luo lasku"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr ""
+"Anna osoite, jos haluat toimituksen suoraan toimittajalta asiakkaalle. Tässä "
+"tapauksessa yhteys varastoon poistetaan ja sen tilalle asetetaan asiakkaan "
+"sijainti."
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -97,15 +189,10 @@ msgstr ""
 "Tätä hinnastoa käytetään oletushinnaston sijasta kyseiselle kumppanille."
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr "Faksi:"
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr "Luo lasku tuote vastaanotettaessa"
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -116,14 +203,15 @@ msgstr ""
 "hinnan kyseiselle tuotteille/määrille."
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
-msgstr "Ostoprosessi"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
-msgstr "Lasku pakkauslistasta"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -131,21 +219,28 @@ msgid "Approve Purchase"
 msgstr "Hyväksy ostotilaus"
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr "Hyväksytty"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
-msgstr "Ostotilaukset käsittelyssä"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Veroton summa"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -156,15 +251,26 @@ msgid "Notes"
 msgstr "Huomautukset"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr "Verot"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -172,20 +278,890 @@ msgid "Purchase Order"
 msgstr "Ostotilaus"
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
-msgstr "Terveisin,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Tilauksen viite"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr "Summa netto:"
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr "Peruttu"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "Hinnasto"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr "Poikkeus toimituksessa"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr "Lähde"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr "Saapuvat tuotteet"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr "Korjattu manuaalisesti"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr "Viite"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Analyyttinen tili"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr "Nettohinta"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "Tilausrivi"
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr "Väärä tuotteen mittayksikkö!"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr "Vahvistettu"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr "Yhteensä:"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr "Vahvista"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr "Laskunhallinta"
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr "Puh.:"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "Pakkauslista"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr "Tilausrivit"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr "Ei kumppania!"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr "Faksi:"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Error !"
+msgstr "Virhe!"
+
+#. 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 ""
+"Sinun täytyy valita kumppani tilauslomakkeesta!\n"
+"Valitse kumppani ennen kuin valitset tuotteen."
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr "Toimittajan hyväksymä"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr "Tilauksesta"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr "Luo lasku"
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr "Varausmääränpää"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Virheellinen toiminto!"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr "Valmis"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr "Yhteensä"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr "Vahvistaja"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "Tarjouspyyntö"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr "Manuaalinen"
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr "Luonnoslasku"
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+"Tämä on laskettu aikaisimmasta ajoitetusta päivästä kaikille ostotilausten "
+"tuotteille."
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr "Tarjouspyyntö:"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr "Ostotilaus odottaa hyväksymistä"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "Vastaanotettu"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr "Tässä on pakkauslistat jotka on luotu tälle ostotilaukselle"
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr "Ostojen hallinta"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr "Verot:"
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Laskutettu"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr "Ostotilauksen rivi"
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr "Kalenterinäkymä"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Terveisin,"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Veroton summa"
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr "Tälle tuotteelle ei ole määritetty kulutiliä: \"%s\" (id:%d)"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr "Sinun täytyy ensin perua kaikki ostotilaukseen liitetyt laskut."
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr "Laske"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "Peru ostotilaus"
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr "Viittaus dokumenttiin joka loi tämän ostotilauspyynnön."
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -203,479 +1179,42 @@ msgstr ""
 "tilaksi tulee \"Valmis\". Jos tilauksen laskutuksessa tai vastaanotossa "
 "käytetään peruuta-toimintoa, tilaksi muttuu poikkeukseksi."
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr "Lähde"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr "Saapuvat tuotteet"
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr "Määrä"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr "Korjattu manuaalisesti"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr "Viite"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr "ALV:"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr "Puh.:"
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr "Analyyttinen tili"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr "Ostotilauksen rivit"
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr "Vahvistaja"
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-"Tilauksesta: luonnoslasku luodaan ennakkoon perustuen ostotilaukseen. "
-"Kirjanpidon täytyy vain vahvistaa lasku kontrollin vuoksi.\n"
-"Vastaanotossa: luonnoslasku luodaan ennakkoon perustuen vastaanotettuihin "
-"tavaroihin.\n"
-"Manuaalinen: laskua ei luoda ennakkoon lainkaan. Kirjanpidon täytyy syöttää "
-"se manuaalisesti."
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr "Lasku perustuen toimituksiin"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr "Nettohinta"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr "Tilausrivi"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr "Vahvistettu"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr "Tuotteen vastaanotto"
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr "Vahvista"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr "Laskunhallinta"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr "Tarjouspyyntö"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr "Odottaa"
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr "Pakkauslista"
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr "Varasto"
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr "Tilausrivit"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr "Vahvista ostotilaus tarjouspyynnöstä ilman lähdettä"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr "Faksi:"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr "Veroton summa"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr "Oletettu päivämäärä"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr "Toimitusosoite:"
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr "Ostojen hinnasto"
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr "Suunniteltu päivämäärä"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr "Toimittajan hyväksymä"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr "Pakkaus"
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr "Yhdistä tilaukset"
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr "Varausmääränpää"
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr "Tilauksen viite"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr "Valmis"
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr "Hinnasto"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr "Laskujen hallinta tilauksista"
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr "Ennakkoon luotu toimittajan lasku tilaukseen perustuen"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr "Lasku ostosta"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr "Pakkaus luodaan tuotteita vastaanotettaessa"
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr "Manuaalinen"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr "Vahvista ostotilaus"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr "Hyväksy ostotilaus vahvistuksen jälkeen"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr "Poikkeus toimituksessa"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr "Syötetty käsin käyttäjän toimesta."
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-"Tämä on laskettu aikaisimmasta ajoitetusta päivästä kaikille ostotilausten "
-"tuotteille."
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Ostotilaukset"
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-"Anna osoite, jos haluat toimituksen suoraan toimittajalta asiakkaalle. Tässä "
-"tapauksessa yhteys varastoon poistetaan ja sen tilalle asetetaan asiakkaan "
-"sijainti."
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr "Tarjouspyyntö:"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr "Vahvista ostotilaus tarjouspyynnöstä"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr "Vahvista ostotilaus"
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr "Tässä on pakkauslistat jotka on luotu tälle ostotilaukselle"
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr "Ostojen hallinta"
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr "Kumppanin viite"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr "Verot:"
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr "Laskutettu"
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr "Määränpään osoite"
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr "Ostotilauksen rivi"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr "Kalenterinäkymä"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr "Aseta luonnokseksi"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr "Toimittaja on hyväksynyt ostotilauksen."
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr "Luonnoslasku"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr "Ostotilaus"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr "Tarjouspyyntö esitetään järjestelmän toimesta."
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr "Pakkauksen lasku"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr "Luo laskun pakkauslistasta"
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr "Toimitus & laskutus"
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr "Viittaus dokumenttiin joka loi tämän ostotilauspyynnön."
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr "Puh.:"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr "Ostotilauksen jälkeen, luo lasku."
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr "Arvioitu päivämäärä"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr "Viittemme tilaukselle"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr "ALV:"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr "Laske"
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "Hinnastoista ei voi olla päällekkäisiä versioita!"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr "Peru ostotilaus"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr "Luo pakkauslista"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr "Yhteensä:"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr "Kun ostotilaus on hyväksytty, sille luodaan pakkauslista."
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr "Tilauksen tila"
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr "Välisumma"
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr "Odottaa"
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr "Oletus ostotilauksien hinnaston versio"
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Yksikköhinta"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
@@ -683,180 +1222,349 @@ msgid "Fiscal Position"
 msgstr "Talouskanta"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr ""
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr "Lasku"
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr "Peruuta"
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
-msgstr "Ostojen ominaisuudet"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
-msgstr "Tilauksen viite"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr "Ostotilaukset"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr "Yhdistä tilaukset"
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
+msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
-msgstr "Uusi ostotilaus"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
-msgstr "Vastaanotettu"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr "Tarjouspyyntö"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
-msgstr "Lähetyspakkaus"
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr "Puh.:"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
-msgstr "Laskujen hallinta vastaanotettaessa"
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr "Viittemme tilaukselle"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Varasto"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr "Pyyntöpäivämäärä"
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr "Hyväksymispäivämäärä"
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
-msgstr ""
-"Moduuli ostojen hallintaan\n"
-"    Tarjouspyynnöt, toimittajien laskujen luonti, tilausten tulostus..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
+msgstr "Tätä ostotilausta ei voida perua!"
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Yksikköhinta"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr "Tuote"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr "Kuvaus"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
-msgstr "Tuotteiden vastaanoton lasku"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr "Odotettu toimitusosoite:"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
-msgstr "Ostotilaus odottaa hyväksymistä"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
-msgstr "Vahvistetaan ostotilausta"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr "Toimitus"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr "Tuotteen mittayksikkö"
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr "Määrä"
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr "Varaus"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
-msgstr "Käyttäjä vahvistaa ostotilauksen."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
+msgstr "Ostotilausta ei voida perua!"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
-msgstr "Ostotilauksen lasku"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr "Tilausviitteesi"
 
 #. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
+#: view:purchase.order:0
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
+msgstr "Oletettu päivämäärä"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Total amount"
-msgstr "Yhteensä"
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr "ALV:"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr "Tilauspäivämäärä"
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr "Toimitusosoite:"
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr "Ostojen hallinta"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
-msgstr "Tarjouspyynnöt"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr "Ostojen hinnasto"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -869,14 +1577,32 @@ msgid "Approve"
 msgstr "Hyväksy"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
-msgstr "Hyväksytty ostotilaus"
+#: view:purchase.order:0
+msgid "To Approve"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
-msgstr "Luo lasku pakkauslistasta."
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -884,72 +1610,280 @@ msgid "Total"
 msgstr "Yhteensä"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr "Oletko varma että haluat yhdistää nämä tilaukset?"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
-msgstr "Hyväksytään ostotilaus"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr "ALV:"
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
-msgstr "Kun ostotilaus on hyväksytty, siitä tulee toimittajan lasku."
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr "Veroton summa"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
 msgstr ""
 
-#, python-format
-#~ msgid "No Pricelist !"
-#~ msgstr "Ei hinnastoa!"
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr ""
 
-#, python-format
-#~ msgid "Invalid action !"
-#~ msgstr "Virheellinen toiminto!"
+#~ msgid "Packing"
+#~ msgstr "Pakkaus"
 
-#, python-format
-#~ msgid "Error !"
-#~ msgstr "Virhe!"
+#~ msgid "Purchase Process"
+#~ msgstr "Ostoprosessi"
+
+#~ msgid "Planned Date"
+#~ msgstr "Suunniteltu päivämäärä"
+
+#~ msgid "Merge purchases"
+#~ msgstr "Yhdistä tilaukset"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
+
+#~ msgid "When controlling invoice from orders"
+#~ msgstr "Laskujen hallinta tilauksista"
+
+#~ msgid "Purchase orders"
+#~ msgstr "Ostotilaukset"
+
+#~ msgid "Partner Ref."
+#~ msgstr "Kumppanin viite"
+
+#~ msgid "Creates invoice from packin list"
+#~ msgstr "Luo laskun pakkauslistasta"
+
+#~ msgid "Scheduled date"
+#~ msgstr "Arvioitu päivämäärä"
+
+#~ msgid "Create Packing list"
+#~ msgstr "Luo pakkauslista"
+
+#~ msgid "Order Status"
+#~ msgstr "Tilauksen tila"
+
+#~ msgid "Order Ref"
+#~ msgstr "Tilauksen viite"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
 
 #~ msgid "You can not have 2 pricelist version that overlaps!"
 #~ msgstr "Hinnastoista ei voi olla päällekkäisiä versioita!"
+
+#~ msgid "Supplier Invoice pre-generated on receptions for control"
+#~ msgstr "Toimittajan lasku ennakoluotu vastaanotettaessa kontrollia varten"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
+
+#~ msgid "Create invoice from product recept"
+#~ msgstr "Luo lasku tuote vastaanotettaessa"
+
+#~ msgid "Purchase Orders in Progress"
+#~ msgstr "Ostotilaukset käsittelyssä"
+
+#~ msgid "Purchase order is confirmed by the user."
+#~ msgstr "Käyttäjä vahvistaa ostotilauksen."
+
+#~ msgid ""
+#~ "From Order: a draft invoice will be pre-generated based on the purchase "
+#~ "order. The accountant will just have to validate this invoice for control.\n"
+#~ "From Picking: a draft invoice will be pre-genearted based on validated "
+#~ "receptions.\n"
+#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
+#~ "manually."
+#~ msgstr ""
+#~ "Tilauksesta: luonnoslasku luodaan ennakkoon perustuen ostotilaukseen. "
+#~ "Kirjanpidon täytyy vain vahvistaa lasku kontrollin vuoksi.\n"
+#~ "Vastaanotossa: luonnoslasku luodaan ennakkoon perustuen vastaanotettuihin "
+#~ "tavaroihin.\n"
+#~ "Manuaalinen: laskua ei luoda ennakkoon lainkaan. Kirjanpidon täytyy syöttää "
+#~ "se manuaalisesti."
+
+#~ msgid "Purchase Order lines"
+#~ msgstr "Ostotilauksen rivit"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Lasku perustuen toimituksiin"
+
+#~ msgid "Confirm Purchase order from Request for quotation without origin"
+#~ msgstr "Vahvista ostotilaus tarjouspyynnöstä ilman lähdettä"
+
+#~ msgid "Product Receipt"
+#~ msgstr "Tuotteen vastaanotto"
+
+#~ msgid "Confirming Purchase"
+#~ msgstr "Vahvista ostotilaus"
+
+#~ msgid "Pre-generated supplier invoice to control based on order"
+#~ msgstr "Ennakkoon luotu toimittajan lasku tilaukseen perustuen"
+
+#~ msgid "Packing is created for the products reception control."
+#~ msgstr "Pakkaus luodaan tuotteita vastaanotettaessa"
+
+#~ msgid "Invoice from Purchase"
+#~ msgstr "Lasku ostosta"
+
+#~ msgid "Encoded manually by the user."
+#~ msgstr "Syötetty käsin käyttäjän toimesta."
+
+#~ msgid "Confirm Purchase Order"
+#~ msgstr "Vahvista ostotilaus"
+
+#~ msgid "Approve Purchase order after Confirming"
+#~ msgstr "Hyväksy ostotilaus vahvistuksen jälkeen"
+
+#~ msgid "Purchase order"
+#~ msgstr "Ostotilaus"
+
+#~ msgid "Request for quotation is proposed by the system."
+#~ msgstr "Tarjouspyyntö esitetään järjestelmän toimesta."
+
+#~ msgid "Purchase order is approved by supplier."
+#~ msgstr "Toimittaja on hyväksynyt ostotilauksen."
+
+#~ msgid "Packing Invoice"
+#~ msgstr "Pakkauksen lasku"
+
+#~ msgid "Delivery & Invoices"
+#~ msgstr "Toimitus & laskutus"
+
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "Hinnastoista ei voi olla päällekkäisiä versioita!"
+
+#~ msgid "After Purchase order , Create invoice."
+#~ msgstr "Ostotilauksen jälkeen, luo lasku."
+
+#~ msgid "Invoice from Packing list"
+#~ msgstr "Lasku pakkauslistasta"
+
+#~ msgid "When purchase order is approved , it creates its packing list."
+#~ msgstr "Kun ostotilaus on hyväksytty, sille luodaan pakkauslista."
+
+#~ msgid "Purchases Properties"
+#~ msgstr "Ostojen ominaisuudet"
+
+#~ msgid "Out Packing"
+#~ msgstr "Lähetyspakkaus"
+
+#~ msgid "Control invoices on receptions"
+#~ msgstr "Laskujen hallinta vastaanotettaessa"
+
+#~ msgid "New Purchase Order"
+#~ msgstr "Uusi ostotilaus"
+
+#~ msgid ""
+#~ "Module for purchase management\n"
+#~ "    Request for quotation, Create Supplier Invoice, Print Order..."
+#~ msgstr ""
+#~ "Moduuli ostojen hallintaan\n"
+#~ "    Tarjouspyynnöt, toimittajien laskujen luonti, tilausten tulostus..."
+
+#~ msgid "Product recept invoice"
+#~ msgstr "Tuotteiden vastaanoton lasku"
+
+#~ msgid "Confirming Purchase Order"
+#~ msgstr "Vahvistetaan ostotilausta"
+
+#~ msgid "Purchase Invoice"
+#~ msgstr "Ostotilauksen lasku"
+
+#~ msgid "From Packing list, Create invoice."
+#~ msgstr "Luo lasku pakkauslistasta."
+
+#~ msgid "After approved purchase order , it comes into the supplier invoice"
+#~ msgstr "Kun ostotilaus on hyväksytty, siitä tulee toimittajan lasku."
+
+#~ msgid "Approving Purchase Order"
+#~ msgstr "Hyväksytään ostotilaus"
+
+#~ msgid "Approved Purchase"
+#~ msgstr "Hyväksytty ostotilaus"
+
+#~ msgid "Request For Quotations"
+#~ msgstr "Tarjouspyynnöt"
+
+#~ msgid "Confirmed Purchase"
+#~ msgstr "Vahvistettu ostotilaus"
+
+#~ msgid "Confirm Purchase order from Request for quotation"
+#~ msgstr "Vahvista ostotilaus tarjouspyynnöstä"
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index e377e827ae3..24e96dc5f8e 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/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-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/gl.po b/addons/purchase/i18n/gl.po
index 6fd49260492..f5a1e737575 100644
--- a/addons/purchase/i18n/gl.po
+++ b/addons/purchase/i18n/gl.po
@@ -7,29 +7,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-02 16:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-11-03 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,location_id:0
-msgid "Destination"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
 msgstr ""
 
 #. module: purchase
@@ -38,43 +61,99 @@ msgid "From Picking"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr ""
 
@@ -84,8 +163,16 @@ msgid "Default Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
 msgstr ""
 
 #. module: purchase
@@ -96,15 +183,10 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -113,13 +195,14 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
 msgstr ""
 
 #. module: purchase
@@ -128,20 +211,27 @@ msgid "Approve Purchase"
 msgstr ""
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
 msgstr ""
 
 #. module: purchase
@@ -153,15 +243,26 @@ msgid "Notes"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -169,20 +270,886 @@ msgid "Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr ""
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+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."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr ""
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -194,467 +1161,41 @@ msgid ""
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr ""
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr ""
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr ""
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr ""
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr ""
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
 msgstr ""
 
 #. module: purchase
@@ -663,177 +1204,348 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr ""
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr ""
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
 msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
+#: report:purchase.order:0
+msgid "Tél. :"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
 msgstr ""
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr ""
 
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
-msgid "Total amount"
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
@@ -847,13 +1559,31 @@ msgid "Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
+#: view:purchase.order:0
+msgid "To Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
 msgstr ""
 
 #. module: purchase
@@ -862,57 +1592,95 @@ msgid "Total"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
 msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: view:purchase.order:0
+msgid "Untaxed amount"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
 msgstr ""
diff --git a/addons/purchase/i18n/hr.po b/addons/purchase/i18n/hr.po
index fc0c791fd77..941a1c428f6 100644
--- a/addons/purchase/i18n/hr.po
+++ b/addons/purchase/i18n/hr.po
@@ -6,29 +6,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,location_id:0
-msgid "Destination"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
 msgstr ""
 
 #. module: purchase
@@ -37,43 +60,99 @@ msgid "From Picking"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr ""
 
@@ -83,8 +162,16 @@ msgid "Default Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
 msgstr ""
 
 #. module: purchase
@@ -95,15 +182,10 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -112,13 +194,14 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
 msgstr ""
 
 #. module: purchase
@@ -127,20 +210,27 @@ msgid "Approve Purchase"
 msgstr ""
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
 msgstr ""
 
 #. module: purchase
@@ -152,15 +242,26 @@ msgid "Notes"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -168,20 +269,886 @@ msgid "Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr ""
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+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."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr ""
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -193,467 +1160,41 @@ msgid ""
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr ""
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr ""
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr ""
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr ""
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr ""
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
 msgstr ""
 
 #. module: purchase
@@ -662,177 +1203,348 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr ""
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr ""
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
 msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
+#: report:purchase.order:0
+msgid "Tél. :"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
 msgstr ""
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr ""
 
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
-msgid "Total amount"
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
@@ -846,13 +1558,31 @@ msgid "Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
+#: view:purchase.order:0
+msgid "To Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
 msgstr ""
 
 #. module: purchase
@@ -861,57 +1591,95 @@ msgid "Total"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
 msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: view:purchase.order:0
+msgid "Untaxed amount"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
 msgstr ""
diff --git a/addons/purchase/i18n/hu.po b/addons/purchase/i18n/hu.po
index 3b13572f37f..65f222b87e4 100644
--- a/addons/purchase/i18n/hu.po
+++ b/addons/purchase/i18n/hu.po
@@ -6,85 +6,172 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-02-17 10:48+0000\n"
 "Last-Translator: Dukai Gábor <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-10-30 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
-msgstr "Számlázott"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
-msgstr ""
+msgstr "Számlázott és Teljesített"
 
 #. module: purchase
 #: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
 msgid "Destination"
+msgstr "Célállomás"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
 msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
-msgstr ""
+msgstr "Kivételből"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr "Rendeltetési hely címe"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
-msgstr ""
-
-#. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Érvényesítve általa"
 
 #. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
+msgstr "Szállító"
+
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
+msgstr "Nincs árlista !"
+
+#. module: purchase
+#: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
+msgid "Quantity"
+msgstr "Mennyiség"
+
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
 msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
-msgid "Delivery"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,product_qty:0
-msgid "Quantity"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
-msgstr ""
+msgid "Set to Draft"
+msgstr "Piszkozat"
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Számla kifogás"
 
 #. module: purchase
 #: model:product.pricelist,name:purchase.list0
 msgid "Default Purchase Pricelist"
+msgstr "Alapértelmezett beszerzési árlista"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
 msgstr ""
 
 #. module: purchase
@@ -93,16 +180,13 @@ msgid ""
 "This pricelist will be used, instead of the default one, for purchases from "
 "the current partner"
 msgstr ""
+"Ez az árlista lesz használva az alapértelmezett helyett, az aktuális "
+"partnertől való vásárlásokkor"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr ""
+msgstr "Fax :"
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
@@ -110,37 +194,47 @@ msgid ""
 "The pricelist sets the currency used for this purchase order. It also "
 "computes the supplier price for the selected products/quantities."
 msgstr ""
+"Az árlista megadja a használt pénznemet ezekhez a beszerzési rendelésekhez. "
+"Ez kiszámítja a kiválasztott termékek/mennyiségek beszállítói árát is."
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
 msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approve Purchase"
-msgstr ""
+msgstr "Beszerzés jóváhagyása"
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
+msgstr "Jóváhagyva"
+
+#. module: purchase
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
-msgstr ""
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr "Készletmozgás"
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
 msgstr ""
 
 #. module: purchase
@@ -152,34 +246,915 @@ msgid "Notes"
 msgstr "Jegyzetek"
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order,amount_tax:0
-#: field:purchase.order.line,taxes_id:0
-msgid "Taxes"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,taxes_id:0
+msgid "Taxes"
+msgstr "Adók"
+
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
 msgid "Purchase Order"
-msgstr ""
+msgstr "Megrendelés"
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
-msgstr ""
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Rendelés hivatkozása"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
+msgstr "Nettó összesen:"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
 msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
+msgstr "Megszakítva"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "Árlista"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr "Szállítási kivétel"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr "Eredet"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr "Bejövő termékek"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr "Manuálisan helyesbítve"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr "Hivatkozás"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Analitikus számla"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr "Nettó ár"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "Rendelési tétel"
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr "Rossz termék ME !"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr "Megerősítve"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr "Összesen :"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr "Megerősítés"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr "Számla ellenőrzés"
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr "Tel.:"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "Kivételi lista"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr "Rendelési tételek"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr "Nincs partner!"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr "Fax:"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Error !"
+msgstr "Hiba !"
+
+#. 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 ""
+"Önnek ki kell választania egy partnert a beszerzési űrlapon !\n"
+"Kérem adjon meg egy partnert mielőtt választ egy terméket."
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr "Beszerzési rendelés megerősítés N°"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr "Jóváhagyva a beszállító által"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr "Rendelésből"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr "Számla létrehozása"
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr "Foglalás rendeltetési helye"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Érvénytelen művelet !"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr "Kész"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr "Teljes összeg"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr "Érvényesítve általa"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "Árajánlatkérés"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr "Manuális"
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr "Számla tervezet"
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr "Árajánlat kérése :"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr "A beszerzési rendelés jóváhagyásra vár"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "Szállítva"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr "Ez a kivételi lista, ami ehhez a beszerzéshez lett generálva"
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr "Beszerés menedzsment"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr "Adók :"
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Számlázva"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr "Beszerzés rendelési tétel"
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr "Naptár nézet"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Üdvözlettel,"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Adómentes összeg"
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr "Dátum, amikor ez a dokumentum létre lett hozva."
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+"Önnek először érvénytelenítenie kell az összes ehhez a beszerzési "
+"rendeléshez csatolt számlát."
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr "Számítás"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "Megrendelés megszakítása"
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr "Történet"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
 msgstr ""
 
 #. module: purchase
@@ -194,724 +1169,534 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
+#: field:purchase.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Összesen"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr ""
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr "Várakozás"
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr ""
+#: model:product.pricelist.version,name:purchase.ver0
+msgid "Default Purchase Pricelist Version"
+msgstr "Alapértelmezett beszerzési árlista verzió"
 
 #. module: purchase
 #: view:purchase.order.line:0
-msgid "Order Line"
+msgid "General Information"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
+#: field:purchase.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Kurzorpozíció"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Request for Quotation N°"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
+#: field:purchase.order,invoice_id:0
+msgid "Invoice"
+msgstr "Számla"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
 msgstr ""
 
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
+#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
+msgid "Cancel"
+msgstr "Mégsem"
+
 #. module: purchase
 #: view:purchase.order:0
-msgid "Invoice Control"
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr "Beszerzési rendelés tételei"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
+#: model:ir.actions.act_window,name:purchase.purchase_form_action
+#: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
+msgid "Purchase Orders"
+msgstr "Beszerzési rendelések"
+
+#. module: purchase
+#: field:purchase.order,origin:0
+msgid "Source Document"
 msgstr ""
 
 #. module: purchase
+#: view:purchase.order.group:0
+msgid "Merge orders"
+msgstr "Rendelések összevonása"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
+#: selection:purchase.report,state:0
+msgid "Request for Quotation"
+msgstr "Árajánlatkérés"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr "Tel. :"
+
+#. module: purchase
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr "A mi rendelési hivatkozásaink"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
 msgid "Warehouse"
 msgstr "Raktár"
 
 #. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
+#: report:purchase.order:0
+msgid "Date Req."
+msgstr "Kérés dátuma"
+
+#. module: purchase
+#: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
+msgid "Date Approved"
+msgstr "Dátum jóváhagyva"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
+msgstr "Nem törölhető ez a beszerzési rendelés !"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Egységár"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
+msgid "Product"
+msgstr "Termék"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,name:0
+#: report:purchase.quotation:0
+msgid "Description"
+msgstr "Leírás"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Expected Delivery address:"
+msgstr "Várható szállítási cím:"
+
+#. module: purchase
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
 msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
-msgid "Untaxed amount"
+msgid "Delivery"
+msgstr "Szállítás"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
+msgid "Product UOM"
+msgstr "Termék ME"
+
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr "Menny"
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_ids:0
+msgid "Reservation"
+msgstr "Foglalás"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
+msgstr "Nem törölhető a beszerzési rendelés !"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Your Order Reference"
+msgstr "A mi rendelési hivatkozásaink"
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
 msgid "Expected Date"
+msgstr "Elvárt dátum"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr "ÁFA:"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
+msgid "Date Ordered"
+msgstr "Rendelés dátuma"
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Shipping address :"
+msgstr "Szállítási cím :"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase Control"
+msgstr "Vezérlőfelületek"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
 #: field:res.partner,property_product_pricelist_purchase:0
 msgid "Purchase Pricelist"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr "Árlista"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr ""
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr "Megrendelés elindítása"
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr ""
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr ""
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr "Megrendelés megszakítása"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr ""
-
-#. module: purchase
-#: model:product.pricelist.version,name:purchase.ver0
-msgid "Default Purchase Pricelist Version"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Request for Quotation N°"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,invoice_id:0
-msgid "Invoice"
-msgstr "Számla"
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
-#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
-msgstr "Beszerzés beállítsai"
-
-#. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
-msgstr "Rendelési hiv."
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action
-msgid "Purchase Orders"
-msgstr ""
-
-#. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
-msgid "Merge orders"
-msgstr ""
-
-#. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
-msgstr "Szállítva"
-
-#. module: purchase
-#: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
-#: selection:purchase.order,state:0
-msgid "Request for Quotation"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Date Req."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,date_approve:0
-msgid "Date Approved"
-msgstr ""
-
-#. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
-msgid "Description"
-msgstr "Leírás"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Delivery address:"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,product_uom:0
-msgid "Product UOM"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,move_ids:0
-msgid "Reservation"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Your Order Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Total amount"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Date Ordered"
-msgstr "Rendelés dátuma"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Purchase Control"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
-msgstr ""
+msgstr "Beszerzési árlista"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
 msgid "Invoicing Control"
-msgstr ""
+msgstr "Vezérlőfelületek"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
 msgid "Approve"
-msgstr ""
+msgstr "Jóváhagyás"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,amount_total:0
-msgid "Total"
-msgstr ""
-
-#. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-msgid "Are you sure you want to merge these orders ?"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
+#: view:purchase.order:0
+msgid "To Approve"
 msgstr ""
 
 #. module: purchase
 #: view:purchase.order.line:0
-msgid "Stock Moves"
-msgstr ""
+msgid "Invoicing"
+msgstr "Számlázás"
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
-msgstr ""
-
-#. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
-msgstr ""
-
-#. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
-msgstr ""
-
-#. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
 msgstr ""
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgid "Purchase order '%s' is cancelled."
 msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_total:0
+msgid "Total"
+msgstr "Összesen"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid "Are you sure you want to merge these orders ?"
+msgstr "Biztos benne, hogy össze akarja vonni ezeket a rendeléseket ?"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr "ÁFA :"
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "title"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr "Adómentes összeg"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr ""
+
+#~ msgid "Confirm Purchase Order"
+#~ msgstr "Megrendelés elindítása"
+
+#~ msgid "Order Ref"
+#~ msgstr "Rendelési hiv."
+
+#~ msgid "Purchases Properties"
+#~ msgstr "Beszerzés beállítsai"
diff --git a/addons/purchase/i18n/id.po b/addons/purchase/i18n/id.po
index 97a243c55c1..510a49e0a76 100644
--- a/addons/purchase/i18n/id.po
+++ b/addons/purchase/i18n/id.po
@@ -6,29 +6,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-11-09 13:54+0000\n"
 "Last-Translator: <>\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-10-30 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,location_id:0
-msgid "Destination"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
 msgstr ""
 
 #. module: purchase
@@ -37,43 +60,99 @@ msgid "From Picking"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr ""
 
@@ -83,8 +162,16 @@ msgid "Default Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
 msgstr ""
 
 #. module: purchase
@@ -95,15 +182,10 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -112,13 +194,14 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
 msgstr ""
 
 #. module: purchase
@@ -127,20 +210,27 @@ msgid "Approve Purchase"
 msgstr ""
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
 msgstr ""
 
 #. module: purchase
@@ -152,15 +242,26 @@ msgid "Notes"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -168,20 +269,886 @@ msgid "Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr ""
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+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."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr ""
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -193,467 +1160,41 @@ msgid ""
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr ""
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr ""
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr ""
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr ""
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr ""
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
 msgstr ""
 
 #. module: purchase
@@ -662,177 +1203,348 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr ""
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr ""
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
 msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
+#: report:purchase.order:0
+msgid "Tél. :"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
 msgstr ""
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr ""
 
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
-msgid "Total amount"
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
@@ -846,13 +1558,31 @@ msgid "Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
+#: view:purchase.order:0
+msgid "To Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
 msgstr ""
 
 #. module: purchase
@@ -861,57 +1591,95 @@ msgid "Total"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
 msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: view:purchase.order:0
+msgid "Untaxed amount"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
 msgstr ""
diff --git a/addons/purchase/i18n/it.po b/addons/purchase/i18n/it.po
index 0d10ba4dd37..adae802386d 100644
--- a/addons/purchase/i18n/it.po
+++ b/addons/purchase/i18n/it.po
@@ -6,74 +6,154 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-11-01 08:41+0000\n"
-"Last-Translator: Lorenzo Battistini <lorenzo.battistini@domsense.com>\n"
+"POT-Creation-Date: 2010-12-03 15:44+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-11-02 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr "Fatturato e Pagato"
 
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
-msgstr "Fattura fornitore pregenerata per il controllo dei ricevimenti"
-
 #. module: purchase
 #: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
 msgid "Destination"
 msgstr "Destinazione"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
 msgstr "Da Prelievo"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr "Indirizzo Destinazione"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr "Convalidato da"
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome del modulo non valido nella definizione dell'azione."
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr "Fornitore"
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
-msgstr "Consegna"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
+msgstr "Nessun Listino Prezzi !"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr "Quantità"
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
-msgstr "Da ordine"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
+msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
-msgstr "Acquisto Confermato"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr "Imposta come Bozza"
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr "Eccezione Fattura"
 
@@ -83,9 +163,20 @@ msgid "Default Purchase Pricelist"
 msgstr "Listino acquisti predefinito"
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
-msgstr "Crea Fattura"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr ""
+"Inserire un indirizzo se si vuole consegnare direttamente la merce dal "
+"fornitore al cliente. In questo caso, verrà rimosso il magazzino e inserito "
+"il cliente."
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -97,15 +188,10 @@ msgstr ""
 "acquisti dal partner corrente."
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr "Fax :"
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr "Creare fattura da ricezione prodotti"
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -116,14 +202,15 @@ msgstr ""
 "il prezzo del fornitore per i prodotti e le quantità selezionate"
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
-msgstr "Procedura d'acquisto"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
-msgstr "Fattura da Lista di Prelievo"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -131,21 +218,28 @@ msgid "Approve Purchase"
 msgstr "Approva Acquisto"
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr "Approvato"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
-msgstr "Ordini Acquisto in corso"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Totale Imponibile"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr "Movimenti di magazzino"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -156,15 +250,26 @@ msgid "Notes"
 msgstr "Note"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr "Tasse"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -172,20 +277,886 @@ msgid "Purchase Order"
 msgstr "Ordine Acquisto"
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
-msgstr "Saluti,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Rif. Ordine"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr "Totale netto:"
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr "Annullato"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "Listino Prezzi"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr "Eccezione Spedizione"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr "Origine"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr "Prodotti in arrivo"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr "Correzione manuale"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr "Referenza"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Contabilità Analitica"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr "Prezzo Netto"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "Riga Ordine"
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr "Confermato"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr "Totale :"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr "Conferma"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr "Controllo Fatturazione"
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr "Tel.:"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "Lista di Presa in Carico"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr "Righe Ordine"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr "Fax:"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+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."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr "Conferma Ordine Acquisto N°"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr "Approvato da Fornitore"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr "Da ordine"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr "Crea Fattura"
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr "Destinazione Prenotata"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Azione non valida !"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr "Completato"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr "Importo Totale"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr "Confermata da"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "RFQ"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr "Manuale"
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr "Bozza Fattura"
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr "Richiesta di quotazione :"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr "Ordini d'Acquisto in Attesa di Approvazione"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "Ricevuto"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr "Questa è la lista delle Prese in Carico generate per questo Acquisto"
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr "Gestione Acquisti"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr "Tasse :"
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fatturato"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr "Riga Ordine d'Acquisto"
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr "Vista calendario"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Saluti,"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Totale Imponibile"
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr "Data in cui questo documento è stato creato"
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr "Calcola"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "Annulla Ordine d'Acquisto"
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr "Cronologia"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr "Riferimento del documento che ha generato questo ordine di acquisto."
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -205,473 +1176,42 @@ msgstr ""
 "fatturazione o di ricezione dei beni, lo stato dell'ordine verrà passato a "
 "'Eccezione'."
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr "Origine"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr "Prodotti in arrivo"
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr "Qta'"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr "Correzione manuale"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr "Referenza"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr "IVA :"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr "Tel.:"
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr "Contabilità Analitica"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr "Righe Ordine Acquisto"
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr "Confermata da"
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr "Fattura sulla base delle consegne"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr "Prezzo Netto"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr "Riga Ordine"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr "Confermato"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr "Prodotto ricevuto"
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr "Conferma"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr "Controllo Fatturazione"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr "RFQ"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr "In attesa"
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr "Lista di Presa in Carico"
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magazzino"
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr "Righe Ordine"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr "Conferma dell'ordine di acquisto"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr "Fax:"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr "Totale Imponibile"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr "Data prevista"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr "Indirizzo Spedizione:"
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr "Listino Prezzi d'Acquisto"
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr "Data Pianificata"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr "Approvato da Fornitore"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr "Imballaggio"
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr "Unisci Acquisti"
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr "Destinazione Prenotata"
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr "Rif. Ordine"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr "Completato"
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr "Listino Prezzi"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr "Quando si controlla la fattura dagli ordini"
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr "Fattura del fornitore Pre-generata per Controllo basato su ordine"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr "Fattura da Acquisti"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr "Il Prelievo è creato sul controllo della ricezione dei prodotti."
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr "Manuale"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr "Conferma acquisto"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr "Approva l'ordine di Acquisto dopo la conferma"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr "Eccezione Spedizione"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr "Codificati manualmente dall'utente."
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Ordini d'Acquisto"
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-"Inserire un indirizzo se si vuole consegnare direttamente la merce dal "
-"fornitore al cliente. In questo caso, verrà rimosso il magazzino e inserito "
-"il cliente."
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr "Richiesta di quotazione :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr "Conferma l'ordine di acquisto dalla richiesta di quotazione"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr "Conferma Ordine d'Acquisto"
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr "Questa è la lista delle Prese in Carico generate per questo Acquisto"
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr "Gestione Acquisti"
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr "Rif. Partner"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr "Tasse :"
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr "Fatturato"
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr "Indirizzo Destinazione"
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr "Riga Ordine d'Acquisto"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr "Vista calendario"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr "Imposta come Bozza"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr "L'ordine di Acquisto è approvato dal venditore."
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr "Bozza Fattura"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr "Ordine Acquisto"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr "La richiesta di quotazione è proposta dal sistema."
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr "Fattura di prelievo"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr "Fattura creata dalla lista di prelievo"
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr "Data in cui questo documento è stato creato"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr "Consegne e Fatture"
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr "Data"
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr "Riferimento del documento che ha generato questo ordine di acquisto."
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr "Tel. :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr "Crea la fattura dopo l'ordine d'acquisto."
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr "Data Programmata"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr "Nostro riferimento ordine"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr "IVA"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr "Calcola"
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "Due versioni del listino non possono sovrapporsi."
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr "Annulla Ordine d'Acquisto"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr "Crea distinta di Imballo"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr "Totale :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr ""
-"Quando l'ordine di acquisto viene approvato, viene creata la distinta "
-"d'imballo associata."
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr "Cronologia"
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr "Stato Ordine"
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr "Subtotale"
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr "In attesa"
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr "Versione predefinita del listino prezzi d'acquisto"
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Prezzo unitario"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
@@ -679,180 +1219,349 @@ msgid "Fiscal Position"
 msgstr "Posizione Fiscale"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr "Richiesta di Quotazione N°"
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr "Fattura"
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr "Annulla"
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
-msgstr "Proprietà d'acquisto"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
-msgstr "Rif. Ordine"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr "Ordini d'Acquisto"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr "Unisci Ordini"
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
 msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
-msgstr "Nuovo Ordine d'Acquisto"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
-msgstr "Ricevuto"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr "Richiesta Preventivo"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr "Tel. :"
+
+#. module: purchase
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
-msgstr "Controllo Fatture in ricevimento"
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr "Nostro riferimento ordine"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magazzino"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr "Data Approvazione"
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
 msgstr ""
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Prezzo unitario"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr "Prodotto"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr "Descrizione"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr "Indirizzo di consegna previsto:"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
-msgstr "Ordini d'Acquisto in Attesa di Approvazione"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
-msgstr "Confermare Ordine di Acquisto"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr "Consegna"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr "Unità di Misura del Prodotto"
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr "Qta'"
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr "Prenotazione"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
-msgstr "L'ordine d'acquisto è confermato dall'utente."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
+msgstr "L'ordine di acquisto non può essere cancellato !"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
-msgstr "Fattura d'acquisto"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr "Vostro riferimento ordine"
 
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr "Conferma Ordine Acquisto N°"
-
 #. module: purchase
 #: view:purchase.order:0
-msgid "Total amount"
-msgstr "Importo Totale"
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
+msgstr "Data prevista"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr "IVA"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr "Ordinato per data"
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr "Indirizzo Spedizione:"
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr "Controllo Acquisto"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
-msgstr "Richiesta di Preventivo"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr "Listino Prezzi d'Acquisto"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -865,14 +1574,32 @@ msgid "Approve"
 msgstr "Approvo"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
-msgstr "Acquisto approvato"
+#: view:purchase.order:0
+msgid "To Approve"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
-msgstr "Crea fattura dalla distinta di imballo."
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -880,57 +1607,253 @@ msgid "Total"
 msgstr "Totale"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr "Sei sicuro di voler unire questi ordini ?"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
-msgstr "Approvazione dell'ordine d'acquisto"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr "IVA :"
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
-msgstr "Movimenti di magazzino"
-
-#. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr "Totale Imponibile"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
 msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr ""
+
+#~ msgid "Create invoice from product recept"
+#~ msgstr "Creare fattura da ricezione prodotti"
+
+#~ msgid "Purchase Orders in Progress"
+#~ msgstr "Ordini Acquisto in corso"
+
+#~ msgid "Merge purchases"
+#~ msgstr "Unisci Acquisti"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per Visualizzazione Architettura!"
+
+#~ msgid "Purchase orders"
+#~ msgstr "Ordini d'Acquisto"
+
+#~ msgid "Confirm Purchase Order"
+#~ msgstr "Conferma Ordine d'Acquisto"
+
+#~ msgid "Partner Ref."
+#~ msgstr "Rif. Partner"
+
+#~ msgid "Purchase order"
+#~ msgstr "Ordine Acquisto"
+
+#~ msgid "Delivery & Invoices"
+#~ msgstr "Consegne e Fatture"
+
+#~ msgid "Scheduled date"
+#~ msgstr "Data Programmata"
+
+#~ msgid "Invoice from Packing list"
+#~ msgstr "Fattura da Lista di Prelievo"
+
+#~ msgid "Order Status"
+#~ msgstr "Stato Ordine"
+
+#~ msgid "Order Ref"
+#~ msgstr "Rif. Ordine"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
+
+#~ msgid "New Purchase Order"
+#~ msgstr "Nuovo Ordine d'Acquisto"
+
+#~ msgid "Confirming Purchase Order"
+#~ msgstr "Confermare Ordine di Acquisto"
+
+#~ msgid "Request For Quotations"
+#~ msgstr "Richiesta di Preventivo"
+
+#~ msgid "Packing"
+#~ msgstr "Imballaggio"
+
+#~ msgid "Supplier Invoice pre-generated on receptions for control"
+#~ msgstr "Fattura fornitore pregenerata per il controllo dei ricevimenti"
+
+#~ msgid "Purchase order is confirmed by the user."
+#~ msgstr "L'ordine d'acquisto è confermato dall'utente."
+
+#~ msgid "Confirmed Purchase"
+#~ msgstr "Acquisto Confermato"
+
+#~ msgid "Purchase Process"
+#~ msgstr "Procedura d'acquisto"
+
+#~ msgid "Confirm Purchase order from Request for quotation without origin"
+#~ msgstr "Conferma dell'ordine di acquisto"
+
+#~ msgid "Product Receipt"
+#~ msgstr "Prodotto ricevuto"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Fattura sulla base delle consegne"
+
+#~ msgid "Confirm Purchase order from Request for quotation"
+#~ msgstr "Conferma l'ordine di acquisto dalla richiesta di quotazione"
+
+#~ msgid "Confirming Purchase"
+#~ msgstr "Conferma acquisto"
+
+#~ msgid "Encoded manually by the user."
+#~ msgstr "Codificati manualmente dall'utente."
+
+#~ msgid "When controlling invoice from orders"
+#~ msgstr "Quando si controlla la fattura dagli ordini"
+
+#~ msgid "Packing is created for the products reception control."
+#~ msgstr "Il Prelievo è creato sul controllo della ricezione dei prodotti."
+
+#~ msgid "Invoice from Purchase"
+#~ msgstr "Fattura da Acquisti"
+
+#~ msgid "Approve Purchase order after Confirming"
+#~ msgstr "Approva l'ordine di Acquisto dopo la conferma"
+
+#~ msgid "Creates invoice from packin list"
+#~ msgstr "Fattura creata dalla lista di prelievo"
+
+#~ msgid "Request for quotation is proposed by the system."
+#~ msgstr "La richiesta di quotazione è proposta dal sistema."
+
+#~ msgid "Purchase order is approved by supplier."
+#~ msgstr "L'ordine di Acquisto è approvato dal venditore."
+
+#~ msgid "Packing Invoice"
+#~ msgstr "Fattura di prelievo"
+
+#~ msgid "When purchase order is approved , it creates its packing list."
+#~ msgstr ""
+#~ "Quando l'ordine di acquisto viene approvato, viene creata la distinta "
+#~ "d'imballo associata."
+
+#~ msgid "From Packing list, Create invoice."
+#~ msgstr "Crea fattura dalla distinta di imballo."
+
+#~ msgid "Approving Purchase Order"
+#~ msgstr "Approvazione dell'ordine d'acquisto"
+
+#~ msgid "Approved Purchase"
+#~ msgstr "Acquisto approvato"
+
+#~ msgid "Purchase Invoice"
+#~ msgstr "Fattura d'acquisto"
+
+#~ msgid "After Purchase order , Create invoice."
+#~ msgstr "Crea la fattura dopo l'ordine d'acquisto."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome del modulo non valido nella definizione dell'azione."
+
+#~ msgid "Planned Date"
+#~ msgstr "Data Pianificata"
+
+#~ msgid "Pre-generated supplier invoice to control based on order"
+#~ msgstr "Fattura del fornitore Pre-generata per Controllo basato su ordine"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "Due versioni del listino non possono sovrapporsi."
+
+#~ msgid "Create Packing list"
+#~ msgstr "Crea distinta di Imballo"
+
+#~ msgid "Control invoices on receptions"
+#~ msgstr "Controllo Fatture in ricevimento"
+
+#~ msgid "Purchases Properties"
+#~ msgstr "Proprietà d'acquisto"
+
+#~ msgid "Purchase Order lines"
+#~ msgstr "Righe Ordine Acquisto"
diff --git a/addons/purchase/i18n/ko.po b/addons/purchase/i18n/ko.po
index 855aad889c7..b9db23a09e4 100644
--- a/addons/purchase/i18n/ko.po
+++ b/addons/purchase/i18n/ko.po
@@ -7,74 +7,153 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-09-08 16:42+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-10-30 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr "인보이스됨 & 지불됨"
 
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
-msgstr "컨트롤을 위한 접수 상에서 미리 생성된 공급자 인보이스"
-
 #. module: purchase
 #: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
 msgid "Destination"
 msgstr "목적지"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr "상품의 구매 UOM과 같은 카테고리에 있는 상품 UOM을 선택하십시오."
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
 msgstr "피킹으로부터"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr "목적지 주소"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr "검증한 이"
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr "공급자"
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
-msgstr "배송"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
+msgstr "가격리스트가 없음!"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr "수량"
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
-msgstr "주문으로부터"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
+msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
-msgstr "확정된 구매"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr "초안으로 설정"
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr "인보이스 예외"
 
@@ -84,9 +163,17 @@ msgid "Default Purchase Pricelist"
 msgstr "디폴트 구매 가격리스트"
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
-msgstr "인보이스 생성"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr "공급자로부터 고객에게 바로 배송하려면 주소를 기입하십시오. 이 경우, 창고 링크가 제거되고, 고객의 위치가 설정됩니다."
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -96,15 +183,10 @@ msgid ""
 msgstr "이 가격리스트는 현재 파트너로부터의 구매에 대해 디폴트 대신에 적용됩니다."
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr "팩스 :"
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr "제품 수령으로부터 인보이스 생성"
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -113,14 +195,15 @@ msgid ""
 msgstr "가격리스트는 이 구매 주문에 이용되는 통화를 설정하며, 선택된 상품/수량에 대해 공급자 가격을 계산합니다."
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
-msgstr "구매 프로세스"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
-msgstr "포잘 리스트로부터 인보이스"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -128,21 +211,28 @@ msgid "Approve Purchase"
 msgstr "구매 승인"
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr "승인됨"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
-msgstr "진행 중인 구매 주문"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "과세되지 않은 금액"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -153,15 +243,26 @@ msgid "Notes"
 msgstr "노트"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr "세금"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -169,20 +270,886 @@ msgid "Purchase Order"
 msgstr "구매 주문"
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
-msgstr "귀하"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr "주문 참조"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr "순 합계:"
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr "취소됨"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "가격리스트"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr "선적 예외"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr "기원"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr "입고 상품"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr "수작업으로 교정됨"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr "참조"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "분석 계정"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr "순 가격"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "주문 라인"
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr "잘못된 상품 UOM !"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr "확정됨"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr "합계:"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr "확정"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr "인보이스 컨트롤"
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr "Tel.:"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "피킹 리스트"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr "주문 라인"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr "파트너가 없음!"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr "팩스:"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+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."
+msgstr "구매 양식에서 파트너를 선택하십시오!"
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr "공급자에 의해 승인됨"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr "주문으로부터"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr "인보이스 생성"
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr "예약 목적지"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "유효하지 않은 액션!"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr "완료"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr "총계"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr "검증한 이"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "RFQ"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr "매뉴얼"
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr "초안 인보이스"
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr "이것은 모든 구매 주문 라인 상품의 최소 스케줄 날짜로 계산됩니다."
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr "견적 요청:"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr "구매 주문 대기 승인"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "수령함"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr "이 구매를 위해 생성된 피킹 리스트"
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr "구매 관리"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr "세금:"
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "인보이스됨"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr "구매 주문 라인"
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr "카렌더 뷰"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "귀하"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "과세되지 않은 금액"
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr "이 상품을 위해 정의된 비용 계정이 없습니다: \"%s\" (id:%d)"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr "먼저 이 구매 주문에 첨부된 모든 인보이스를 취소해야 합니다."
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr "계산"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "구매 주문 취소"
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr "이 구매 주문 요청을 생성한 문서 참조"
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -197,471 +1164,42 @@ msgstr ""
 "전환됩니다. 다시, 해당 공급자가 그 주문을 확정하면, 상태는 '승인됨'으로 전환합니다. 구매 주문이 결제되며, 마침내 상태는 '완료'로 "
 "바뀝니다. 인보이스 또는 제품 수령 단계에서 취소 액션이 발생하면, 상태는 '예외'로 지정됩니다."
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr "기원"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr "입고 상품"
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr "수량"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr "수작업으로 교정됨"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr "참조"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr "Tel.:"
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr "분석 계정"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr "구매 주문 라인"
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr "검증한 이"
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-"주문으로부터: 초안 인보이스가 구매 주문을 토대로 미리 생성됩니다. 이 인보이스는 회계사무원에 의해 확인되어야 합니다. \n"
-"피킹으로부터: 초안 인보이스가 확인된 수령으로부터 미리 생성됩니다.\n"
-"수작업: 어떤 인보이스도 미리 생성되지 않습니다. 회계사무원이 수작업으로 인코드해야 합니다."
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr "배송에 기초한 인보이스"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr "순 가격"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr "주문 라인"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr "확정됨"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr "상품 수령"
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr "확정"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr "인보이스 컨트롤"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr "RFQ"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr "대기"
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr "피킹 리스트"
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr "창고"
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr "주문 라인"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr "기원이 없는 견적 요청으로부터 구매 주문 확정"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr "팩스:"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr "과세되지 않은 금액"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr "예상되는 날짜"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr "선적 주소:"
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr "구매 가격리스트"
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr "계획된 날짜"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr "공급자에 의해 승인됨"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr "포장"
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr "구매 합치기"
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr "예약 목적지"
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr "주문 참조"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr "완료"
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr "가격리스트"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr "주문으로부터 인보이스를 컨트롤할 때"
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "유효하지 않은 뷰 아키텍처를 위한 XML"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr "주문에 기초하여 컨트롤하기 위한 미리 생성된 공급자 인보이스"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr "구매로부터 인보이스"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr "상품 수령 컨트롤을 위해 포장이 생성됩니다."
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr "매뉴얼"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr "구매 확정"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr "확정 후 구매 주문 승인"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr "선적 예외"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr "사용자에 의해 수작업으로 인코드됨"
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr "이것은 모든 구매 주문 라인 상품의 최소 스케줄 날짜로 계산됩니다."
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "구매 주문"
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr "공급자로부터 고객에게 바로 배송하려면 주소를 기입하십시오. 이 경우, 창고 링크가 제거되고, 고객의 위치가 설정됩니다."
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr "견적 요청:"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr "견적 요청으로부터 구매 주문 확정"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr "구매 주문 확정"
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr "이 구매를 위해 생성된 피킹 리스트"
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr "구매 관리"
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr "파트너 참조"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr "세금:"
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr "인보이스됨"
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr "목적지 주소"
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr "구매 주문 라인"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr "카렌더 뷰"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr "초안으로 설정"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr "구매 주문이 공급자에 의해 승인됨."
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr "초안 인보이스"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr "구매 주문"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr "견적 요청이 시스템에 의해 제안됨"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr "포장 인보이스"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr "포장 리스트로부터 인보이스 생성"
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr "배송 & 인보이스"
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr "이 구매 주문 요청을 생성한 문서 참조"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr "Tél. :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr "구매 주문 후, 인보이스 생성."
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr "예정된 날짜"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr "주문 참조"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr "TVA:"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr "계산"
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr "구매 주문 취소"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr "포장 리스트 만들기"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr "합계:"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr "구매 주문이 승인될 때, 포장 리스트를 생성합니다."
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr "주문 상태"
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr "소계"
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr "대기"
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr "디폴트 구매 가격리스트 버전"
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "유닛 가격"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
@@ -669,180 +1207,349 @@ msgid "Fiscal Position"
 msgstr "회계 포지션"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr ""
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr "인보이스"
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr "취소"
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
-msgstr "구매 속성"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
-msgstr "주문 참조"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr "구매 주문"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr "주문 합치기"
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함할 수 없습니다 !"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
+msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
-msgstr "새 구매 주문"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
-msgstr "수령함"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr "견적 요청"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
-msgstr "외부 포장"
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr "Tél. :"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
-msgstr "수령 시 인보이스 컨트롤"
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr "주문 참조"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "창고"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr "날짜 참조"
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr "승인된 날짜"
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
-msgstr ""
-"구매 관리 모듈\n"
-"     견적 요청, 공급자 인보이스 생성, 주문 인쇄..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
+msgstr "이 구매 주문을 취소할 수 없습니다 !"
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "유닛 가격"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr "상품"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr "설명"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
-msgstr "상품 수령 인보이스"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr "예정된 배송 주소:"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
-msgstr "구매 주문 대기 승인"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
-msgstr "구매 주문 확정"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr "배송"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr "상품 UOM"
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr "수량"
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr "예약"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
-msgstr "구매 주문이 사용자에 의해 확정되었습니다."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
+msgstr "구매 주문을 취소할 수 없습니다 !"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
-msgstr "구매 인보이스"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr "귀하의 주문 참조"
 
 #. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
+#: view:purchase.order:0
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
+msgstr "예상되는 날짜"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Total amount"
-msgstr "총계"
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr "TVA:"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr "주문 날짜"
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr "선적 주소:"
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr "구매 컨트롤"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
-msgstr "견적 요청"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr "구매 가격리스트"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -855,14 +1562,32 @@ msgid "Approve"
 msgstr "승인"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
-msgstr "승인된 구매"
+#: view:purchase.order:0
+msgid "To Approve"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
-msgstr "포장 리스트로부터 인보이스 생성"
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -870,61 +1595,105 @@ msgid "Total"
 msgstr "합계"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr "이 주문들을 합치겠습니까 ?"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
-msgstr "구매 주문 승인"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
-msgstr "구매 주문을 승인한 뒤, 공급자 인보이스로 들어갑니다."
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr "과세되지 않은 금액"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
 msgstr ""
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr ""
+
+#~ msgid "Packing"
+#~ msgstr "포장"
+
+#~ msgid "Supplier Invoice pre-generated on receptions for control"
+#~ msgstr "컨트롤을 위한 접수 상에서 미리 생성된 공급자 인보이스"
+
 #~ msgid ""
 #~ "Please note that orders will only be merged if they are to the same partner "
 #~ "and going to the same location, and lines will only be merged if they are "
@@ -933,20 +1702,41 @@ msgstr ""
 #~ "주문들은 동일한 파트너 및 동일한 위치를 향할 때만 합병될 수 있으며, 라인들은 수량과 유닛 외에는 정확히 동일할 경우에만 합쳐질 수 "
 #~ "있습니다."
 
-#, python-format
-#~ msgid "No Pricelist !"
-#~ msgstr "가격리스트가 없음!"
+#~ msgid "Purchase Process"
+#~ msgstr "구매 프로세스"
+
+#~ msgid "Confirmed Purchase"
+#~ msgstr "확정된 구매"
+
+#~ msgid "Create invoice from product recept"
+#~ msgstr "제품 수령으로부터 인보이스 생성"
 
 #~ msgid "N°"
 #~ msgstr "N°"
 
-#, python-format
-#~ msgid "You must first cancel all invoices attached to this purchase order."
-#~ msgstr "먼저 이 구매 주문에 첨부된 모든 인보이스를 취소해야 합니다."
+#~ msgid "Purchase Orders in Progress"
+#~ msgstr "진행 중인 구매 주문"
 
-#, python-format
-#~ msgid "Wrong Product UOM !"
-#~ msgstr "잘못된 상품 UOM !"
+#~ msgid "Purchase order is confirmed by the user."
+#~ msgstr "구매 주문이 사용자에 의해 확정되었습니다."
+
+#~ msgid "Purchase Order lines"
+#~ msgstr "구매 주문 라인"
+
+#~ msgid ""
+#~ "From Order: a draft invoice will be pre-generated based on the purchase "
+#~ "order. The accountant will just have to validate this invoice for control.\n"
+#~ "From Picking: a draft invoice will be pre-genearted based on validated "
+#~ "receptions.\n"
+#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
+#~ "manually."
+#~ msgstr ""
+#~ "주문으로부터: 초안 인보이스가 구매 주문을 토대로 미리 생성됩니다. 이 인보이스는 회계사무원에 의해 확인되어야 합니다. \n"
+#~ "피킹으로부터: 초안 인보이스가 확인된 수령으로부터 미리 생성됩니다.\n"
+#~ "수작업: 어떤 인보이스도 미리 생성되지 않습니다. 회계사무원이 수작업으로 인코드해야 합니다."
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "배송에 기초한 인보이스"
 
 #, python-format
 #~ msgid ""
@@ -956,45 +1746,143 @@ msgstr ""
 #~ "구매 양식에서 가격리스트를 선택해야 합니다!\n"
 #~ "상품을 선택하기 전에 먼저 하나를 설정하십시오."
 
-#, python-format
-#~ msgid "Error !"
-#~ msgstr "에러!"
+#~ msgid "Confirm Purchase order from Request for quotation without origin"
+#~ msgstr "기원이 없는 견적 요청으로부터 구매 주문 확정"
 
-#, python-format
-#~ msgid "Invalid action !"
-#~ msgstr "유효하지 않은 액션!"
+#~ msgid "Product Receipt"
+#~ msgstr "상품 수령"
+
+#~ msgid "Planned Date"
+#~ msgstr "계획된 날짜"
+
+#~ msgid "Merge purchases"
+#~ msgstr "구매 합치기"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "유효하지 않은 뷰 아키텍처를 위한 XML"
+
+#~ msgid "Confirming Purchase"
+#~ msgstr "구매 확정"
+
+#~ msgid "When controlling invoice from orders"
+#~ msgstr "주문으로부터 인보이스를 컨트롤할 때"
+
+#~ msgid "Pre-generated supplier invoice to control based on order"
+#~ msgstr "주문에 기초하여 컨트롤하기 위한 미리 생성된 공급자 인보이스"
+
+#~ msgid "Packing is created for the products reception control."
+#~ msgstr "상품 수령 컨트롤을 위해 포장이 생성됩니다."
+
+#~ msgid "Invoice from Purchase"
+#~ msgstr "구매로부터 인보이스"
+
+#~ msgid "Approve Purchase order after Confirming"
+#~ msgstr "확정 후 구매 주문 승인"
+
+#~ msgid "Purchase orders"
+#~ msgstr "구매 주문"
+
+#~ msgid "Encoded manually by the user."
+#~ msgstr "사용자에 의해 수작업으로 인코드됨"
+
+#~ msgid "Confirm Purchase Order"
+#~ msgstr "구매 주문 확정"
+
+#~ msgid "Confirm Purchase order from Request for quotation"
+#~ msgstr "견적 요청으로부터 구매 주문 확정"
+
+#~ msgid "Partner Ref."
+#~ msgstr "파트너 참조"
+
+#~ msgid "Purchase order"
+#~ msgstr "구매 주문"
+
+#~ msgid "Request for quotation is proposed by the system."
+#~ msgstr "견적 요청이 시스템에 의해 제안됨"
+
+#~ msgid "Creates invoice from packin list"
+#~ msgstr "포장 리스트로부터 인보이스 생성"
+
+#~ msgid "Purchase order is approved by supplier."
+#~ msgstr "구매 주문이 공급자에 의해 승인됨."
+
+#~ msgid "Packing Invoice"
+#~ msgstr "포장 인보이스"
+
+#~ msgid "Delivery & Invoices"
+#~ msgstr "배송 & 인보이스"
+
+#~ msgid "Scheduled date"
+#~ msgstr "예정된 날짜"
+
+#~ msgid "Create Packing list"
+#~ msgstr "포장 리스트 만들기"
+
+#~ msgid "After Purchase order , Create invoice."
+#~ msgstr "구매 주문 후, 인보이스 생성."
+
+#~ msgid "Invoice from Packing list"
+#~ msgstr "포잘 리스트로부터 인보이스"
+
+#~ msgid "When purchase order is approved , it creates its packing list."
+#~ msgstr "구매 주문이 승인될 때, 포장 리스트를 생성합니다."
+
+#~ msgid "Order Ref"
+#~ msgstr "주문 참조"
+
+#~ msgid "Order Status"
+#~ msgstr "주문 상태"
+
+#~ msgid "Purchases Properties"
+#~ msgstr "구매 속성"
+
+#~ msgid "Out Packing"
+#~ msgstr "외부 포장"
+
+#~ msgid "Control invoices on receptions"
+#~ msgstr "수령 시 인보이스 컨트롤"
+
+#~ msgid "New Purchase Order"
+#~ msgstr "새 구매 주문"
 
-#, python-format
 #~ msgid ""
-#~ "You have to select a partner in the purchase form !\n"
-#~ "Please set one partner before choosing a product."
-#~ msgstr "구매 양식에서 파트너를 선택하십시오!"
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함할 수 없습니다 !"
 
-#, python-format
 #~ msgid ""
-#~ "You have to select a product UOM in the same category than the purchase UOM "
-#~ "of the product"
-#~ msgstr "상품의 구매 UOM과 같은 카테고리에 있는 상품 UOM을 선택하십시오."
+#~ "Module for purchase management\n"
+#~ "    Request for quotation, Create Supplier Invoice, Print Order..."
+#~ msgstr ""
+#~ "구매 관리 모듈\n"
+#~ "     견적 요청, 공급자 인보이스 생성, 주문 인쇄..."
 
-#, python-format
-#~ msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
-#~ msgstr "이 상품을 위해 정의된 비용 계정이 없습니다: \"%s\" (id:%d)"
+#~ msgid "Product recept invoice"
+#~ msgstr "상품 수령 인보이스"
 
-#, python-format
-#~ msgid "Could not cancel this purchase order !"
-#~ msgstr "이 구매 주문을 취소할 수 없습니다 !"
-
-#, python-format
-#~ msgid "No Partner!"
-#~ msgstr "파트너가 없음!"
+#~ msgid "Confirming Purchase Order"
+#~ msgstr "구매 주문 확정"
 
 #, python-format
 #~ msgid "You must first cancel all packing attached to this purchase order."
 #~ msgstr "이 구매 주문에 첨부된 모든 포장을 먼저 취소해야 합니다."
 
-#, python-format
-#~ msgid "Could not cancel purchase order !"
-#~ msgstr "구매 주문을 취소할 수 없습니다 !"
+#~ msgid "Request For Quotations"
+#~ msgstr "견적 요청"
+
+#~ msgid "Purchase Invoice"
+#~ msgstr "구매 인보이스"
 
 #~ msgid "You can not have 2 pricelist version that overlaps!"
 #~ msgstr "중복되는 두 가격리스트 버전들은 허용되지 않습니다."
+
+#~ msgid "From Packing list, Create invoice."
+#~ msgstr "포장 리스트로부터 인보이스 생성"
+
+#~ msgid "After approved purchase order , it comes into the supplier invoice"
+#~ msgstr "구매 주문을 승인한 뒤, 공급자 인보이스로 들어갑니다."
+
+#~ msgid "Approving Purchase Order"
+#~ msgstr "구매 주문 승인"
+
+#~ msgid "Approved Purchase"
+#~ msgstr "승인된 구매"
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index 363a018dc55..50e6f037529 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/i18n/lt.po
@@ -6,86 +6,175 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 07:18+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+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-10-30 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
-msgstr ""
+msgstr "Išrašyta S/F ir apmokėta"
 
 #. module: purchase
 #: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
 msgid "Destination"
+msgstr "Paskirties vieta"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
 msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
-msgstr ""
+msgstr "Iš važtaraščio"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr "Paskirties vietos adresas"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
-msgstr ""
-
-#. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Patvirtintas"
 
 #. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr "Tiekėjas"
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
-msgstr "Pristatymas"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
+msgstr "Nėra kainoraščio!"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr "Kiekis"
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
 msgstr ""
 
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr "Nustatyti kaip juodraštį"
+
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Sąskaitos faktūros išimtis"
 
 #. module: purchase
 #: model:product.pricelist,name:purchase.list0
 msgid "Default Purchase Pricelist"
+msgstr "Numatytas pardavimų kainoraštis"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
-msgstr "Sukurti sąskaitą faktūrą"
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr ""
+"Įveskite adresą, jei norite iš tiekėjo pristatyti tiesiogiai pirkėjui. Tokiu "
+"atveju bus pašalinta sandėlio nuoroda ir nurodyta pirkėjo vieta."
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -93,16 +182,13 @@ msgid ""
 "This pricelist will be used, instead of the default one, for purchases from "
 "the current partner"
 msgstr ""
+"Šis kainoraštis bus naudojamas vietoje numatytojo pirkimams iš dabartinio "
+"partnerio"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
-msgstr "Faksas:"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr ""
+msgstr "Faksas :"
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
@@ -112,35 +198,43 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
 msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approve Purchase"
-msgstr ""
+msgstr "Patvirtinti pirkimą"
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr "Patvirtinta"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
-msgstr "Vykdomi pirkimų užsakymai"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
 msgstr ""
 
 #. module: purchase
@@ -152,15 +246,26 @@ msgid "Notes"
 msgstr "Pastabos"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr "Mokesčiai"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -168,20 +273,890 @@ msgid "Purchase Order"
 msgstr "Pirkimo užsakymas"
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Užsakymo nuoroda"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Total :"
+msgstr "Suma be PVM:"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+msgid "Products"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
-msgid "Net Total :"
+#: 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
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
 msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr "Nutrauktas"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "Kainoraštis"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr "Kilmė"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr "Gaunami produktai"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr "Koreguotas rankiniu būdu"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr "Nuoroda"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Analitinė sąskaita"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr "Galutinė kaina"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "Užsakymo eilutė"
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr "Netinkamas produkto mato vnt.!"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr "Patvirtinta"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr "Iš viso:"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr "Patvirtinti"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr "S/F kontrolė"
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr "Tel.:"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "Važtaraštis"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr "Užsakymo eilutės"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr "Nėra partnerio!"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr "Faksas:"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Error !"
+msgstr "Klaida!"
+
+#. 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 ""
+"Privalote pasirinkti partnerį pirkimo formoje!\n"
+"Prašome tai padaryti prieš pasirenkant produktą."
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr "Patvirtintas tiekėjo"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr "Iš užsakymo"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr "Sukurti sąskaitą faktūrą"
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr "Rezervacijos vieta"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Netinkamas veiksmas!"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr "Atlikta"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr "Iš viso"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr "Patikrinta"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr "Rankinis"
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr "Sąskaitos faktūros juodraštis"
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr "Kainų užklausa:"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr "Pirkimo užsakymas laukiantis patvirtinimo"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "Gauta"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr "Šis sąrašas buvo sugeneruotas iš šio pirkimo važtaraščio"
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr "Pirkimų valdymas"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr "Mokesčiai:"
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "S/F išrašyta"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr "Pirkimo užsakymo eilutė"
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr "Kalendoriaus rodinys"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Su pagarba,"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Suma be mokesčių"
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+"Pirmiausia atšaukite visas sąskaitas faktūras susijusias su šiuo pirkimo "
+"užsakymu."
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr "Skaičiuoti"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "Nutraukti pirkimo užsakymą"
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -194,652 +1169,396 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr "Kilmė(s šalis)"
+#: field:purchase.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Tarpinė suma"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr ""
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr "Laukiama"
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr "Nuoroda"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr "Tel.:"
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr "Analitinė sąskaita"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr ""
+#: model:product.pricelist.version,name:purchase.ver0
+msgid "Default Purchase Pricelist Version"
+msgstr "Numatytoji pirkimų kainoraščio versija"
 
 #. module: purchase
 #: view:purchase.order.line:0
-msgid "Order Line"
+msgid "General Information"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr "Patvirtinta"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr "Patvirtinti"
+#: field:purchase.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Fiskalinė pozicija"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Request for Quotation N°"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
+#: field:purchase.order,invoice_id:0
+msgid "Invoice"
+msgstr "Sąskaita faktūra"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
+#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
+msgid "Cancel"
+msgstr "Atšaukti"
 
 #. module: purchase
 #: view:purchase.order:0
-msgid "Invoice Control"
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr "Pirkimo užsakymo eilutės"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
+#: model:ir.actions.act_window,name:purchase.purchase_form_action
+#: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
+msgid "Purchase Orders"
+msgstr "Pirkimų užsakymai"
+
+#. module: purchase
+#: field:purchase.order,origin:0
+msgid "Source Document"
 msgstr ""
 
 #. module: purchase
+#: view:purchase.order.group:0
+msgid "Merge orders"
+msgstr "Sujungti užsakymus"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
+#: selection:purchase.report,state:0
+msgid "Request for Quotation"
+msgstr "Kainų užklausa"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr "Tel.:"
+
+#. module: purchase
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr "Mūsų užsakymo nuoroda"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
 msgid "Warehouse"
 msgstr "Sandėlis"
 
 #. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
+#: report:purchase.order:0
+msgid "Date Req."
+msgstr "Užsakymo data"
+
+#. module: purchase
+#: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
+msgid "Date Approved"
+msgstr "Patvirtinimo data"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
+msgstr "Negalima atšaukti šio pirkimo užsakymo!"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Vieneto kaina"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
+msgid "Product"
+msgstr "Produktas"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,name:0
+#: report:purchase.quotation:0
+msgid "Description"
+msgstr "Aprašymas"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Expected Delivery address:"
+msgstr "Num. pristatymo adresas:"
+
+#. module: purchase
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
 msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr "Neapmokestinama suma"
+msgid "Delivery"
+msgstr "Pristatymas"
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
+msgid "Product UOM"
+msgstr "Produkto mato vnt."
+
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr "Kiekis"
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_ids:0
+msgid "Reservation"
+msgstr "Rezervacija"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
+msgstr "Negalima atšaukti pirkimo užsakymo!"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Your Order Reference"
+msgstr "Jūsų užsakymo nuoroda"
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
+msgstr "Numoma pristymo data"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr "PVM mok. kodas:"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
+msgid "Date Ordered"
+msgstr "Užsakymo data"
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Shipping address :"
+msgstr "Pristatymo adresas:"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase Control"
+msgstr "Pirkimo kontrolė"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
 msgstr ""
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
 #: field:res.partner,property_product_pricelist_purchase:0
 msgid "Purchase Pricelist"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr "Patvirtintas tiekėjo"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr "Atlikta"
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr "Kainoraštis"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr ""
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Netinkamas XML peržiūros architektūrai!"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr "Rankinis"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Pirkimų užsakymai"
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr "Patvirtinti pirkimo užsakymą"
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr ""
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr "Pirkimų valdymas"
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr "Partnerio nuoroda"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr "Mokesčiai:"
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr "Nustatyti kaip juodraštį"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr "Pirkimo užsakymas yra patvirtintas tiekėjo"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr "Sąskaitos faktūros juodraštis"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr "Pirkimo užsakymas"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr "Skaičiuoti"
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr "Nutraukti pirkimo užsakymą"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr "Iš viso:"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Tarpinė suma"
-
-#. module: purchase
-#: model:product.pricelist.version,name:purchase.ver0
-msgid "Default Purchase Pricelist Version"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Vieneto kaina"
-
-#. module: purchase
-#: field:purchase.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Request for Quotation N°"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,invoice_id:0
-msgid "Invoice"
-msgstr "Sąskaita faktūra"
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
-#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
-msgid "Cancel"
-msgstr "Atšaukti"
-
-#. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action
-msgid "Purchase Orders"
-msgstr "Pirkimų užsakymai"
-
-#. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
-msgid "Merge orders"
-msgstr "Sujungti užsakymus"
-
-#. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objekto pavadinimas turi prasidėti x_ ir neturėti jokių specialių simbolių!"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
-msgstr "Naujas pirkimo užsakymas"
-
-#. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
-#: selection:purchase.order,state:0
-msgid "Request for Quotation"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Date Req."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,date_approve:0
-msgid "Date Approved"
-msgstr ""
-
-#. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,product_id:0
-msgid "Product"
-msgstr "Produktas"
-
-#. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
-msgid "Description"
-msgstr "Aprašymas"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Delivery address:"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
-msgstr "Pirkimo užsakymas laukiantis patvirtinimo"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
-msgstr "Patvirtinti pirkimo užsakymą"
-
-#. module: purchase
-#: field:purchase.order.line,product_uom:0
-msgid "Product UOM"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,move_ids:0
-msgid "Reservation"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
-msgstr "Pirkimo užsakymas yra patvirtintas naudotojo."
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Your Order Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Total amount"
-msgstr "Iš viso"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Date Ordered"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Purchase Control"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
-msgstr ""
+msgstr "Pirkimo kainoraštis"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
 msgid "Invoicing Control"
-msgstr ""
+msgstr "S/F kontrolė"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
@@ -847,13 +1566,31 @@ msgid "Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
+#: view:purchase.order:0
+msgid "To Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
 msgstr ""
 
 #. module: purchase
@@ -862,57 +1599,130 @@ msgid "Total"
 msgstr "Iš viso"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr "Ar tikrai norite sujungti šiuos užsakymus?"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr "PVM mok. kodas:"
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
 msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr "Neapmokestinama suma"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
 msgstr ""
+
+#~ msgid "Purchase Orders in Progress"
+#~ msgstr "Vykdomi pirkimų užsakymai"
+
+#~ msgid "Purchase orders"
+#~ msgstr "Pirkimų užsakymai"
+
+#~ msgid "Purchase order"
+#~ msgstr "Pirkimo užsakymas"
+
+#~ msgid "Confirm Purchase Order"
+#~ msgstr "Patvirtinti pirkimo užsakymą"
+
+#~ msgid "Confirming Purchase Order"
+#~ msgstr "Patvirtinti pirkimo užsakymą"
+
+#~ msgid "New Purchase Order"
+#~ msgstr "Naujas pirkimo užsakymas"
+
+#~ msgid "Purchase order is confirmed by the user."
+#~ msgstr "Pirkimo užsakymas yra patvirtintas naudotojo."
+
+#~ msgid "Partner Ref."
+#~ msgstr "Partnerio nuoroda"
+
+#~ msgid "Purchase order is approved by supplier."
+#~ msgstr "Pirkimo užsakymas yra patvirtintas tiekėjo"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Netinkamas XML peržiūros architektūrai!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objekto pavadinimas turi prasidėti x_ ir neturėti jokių specialių simbolių!"
diff --git a/addons/purchase/i18n/mn.po b/addons/purchase/i18n/mn.po
index 13200eeeacf..f338d6e62d4 100644
--- a/addons/purchase/i18n/mn.po
+++ b/addons/purchase/i18n/mn.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-12 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+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 53788768757..f7411ae0be7 100644
--- a/addons/purchase/i18n/nl.po
+++ b/addons/purchase/i18n/nl.po
@@ -6,75 +6,155 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-07 07:37+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+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-10-30 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr "Gefactureerd & Betaald"
 
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
-msgstr ""
-"Concept-inkoopfactuur aangemaakt om binnenkomende goederen te controleren."
-
 #. module: purchase
 #: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
 msgid "Destination"
 msgstr "Bestemming"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+"De meeteenheid die geselecteerd moet worden moet dezelfde zijn is die van "
+"het product"
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
 msgstr "Van ontvangsten"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr "Bestemmingsadres"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr "Goedgekeurd door"
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de actie-definitie."
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr "Leverancier"
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
-msgstr "Levering"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
+msgstr "Geen prijslijst!"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr "Aantal"
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
-msgstr "Van order"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
+msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
-msgstr "Goedgekeurde inkoop"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr "Naar Concept"
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr "Factuur uitzondering"
 
@@ -84,9 +164,20 @@ msgid "Default Purchase Pricelist"
 msgstr "Standaard inkoopprijslijst"
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
-msgstr "Creeer factuur"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr ""
+"Voeg een adres toe wanneer je direct vanaf de leverancier richting de klant "
+"wilt leveren. Dit zorgt er voor dat het product niet via de eigen voorraad "
+"zal gaan lopen."
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -98,15 +189,10 @@ msgstr ""
 "bij deze relatie."
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr "Fax:"
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr "Maak factuur op basis van productontvangst"
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -117,14 +203,15 @@ msgstr ""
 "inkoopprijs voor de geselecteerd producten."
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
-msgstr "Inkoopproces"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
-msgstr "Factureer op basis van pakbonnen"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -132,21 +219,28 @@ msgid "Approve Purchase"
 msgstr "Goedgekeurde inkoopfacturen"
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr "Goedgekeurd"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
-msgstr "Lopende inkooporders"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Netto Bedrag"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr "Goederenstromen"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -157,15 +251,26 @@ msgid "Notes"
 msgstr "Notities"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr "Belastingen"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -173,20 +278,894 @@ msgid "Purchase Order"
 msgstr "Inkooporder"
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
-msgstr "Met vriendelijk groet,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Order referentie"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr "Netto totaal :"
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "Prijslijst"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr "Verzenduitzondering"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr "Brondocument"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr "Binnenkomende producten"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr "Handmatig gecorrigeerd"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr "Referentie"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Kostenplaatsen"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr "Netto-prijs"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "Orderregel"
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr "Verkeerde product meeteenheid!"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr "Bevestigd"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr "Totaal :"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr "Bevestig"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr "Factuurcontrole"
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr "Tef.:"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "Pakbon"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr "Orderregels"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr "Geen relatie geselecteerd!"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr "Fax:"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Error !"
+msgstr "Fout !"
+
+#. 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 ""
+"Er moeten een relatie worden geselecteerd in het inkoopformulier!\n"
+"Selecteer een relatie voordat een product wordt gekozen."
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr "Bestelopdracht bevestigingsnr."
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr "Goedgekeurd door leverancier"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr "Van order"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr "Creeer factuur"
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr "Gereserveerde bestemming"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Foutieve handeling!"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr "Gereed"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr "Totaalbedrag"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr "Goedgekeurd door"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "Offerte-aanvraag"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr "Handmatig"
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr "concept-factuur"
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+"Dit is een berekende minimale geplande datum van alle inkooporderregels."
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr "Inkoopofferte-aanvraag :"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr "Nog goedgekeurd te worden inkooporders"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "Ontvangen"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr ""
+"Dit is een lijst van pakbonnen welke zijn gegenereerd op basis van deze "
+"inkoop"
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr "Inkoopbeheer"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr "Belastingen :"
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Gefactureerd"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr "Inkooporderregel"
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr "Kalenderoverzicht"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Met vriendelijk groet,"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Netto Bedrag"
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr "Datum waarop dit document gemaakt is."
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr "Er is geen inkoopgrootboekkaart gekoppeld aan dit product!"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+"Annuleer eerst alle inkoopfacturen welke zijn gekoppeld aan deze inkooporder."
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr "Bereken"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "Verwijder Inkooporder"
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr "Historie"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+"Referente op het document welke wordt gegenereerd voor deze inkoopofferte-"
+"aanvraag"
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -203,481 +1182,42 @@ msgstr ""
 "door de leverancier is bevestigd dan wordt deze 'approved'. Tenslotte is de "
 "inkooporder na betaling en ontvangst afgewerkt."
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr "Brondocument"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr "Binnenkomende producten"
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr "Hvhd"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr "Handmatig gecorrigeerd"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr "Referentie"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr "BTW"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr "Tef.:"
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr "Kostenplaatsen"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr "Inkooporderregels"
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr "Goedgekeurd door"
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-"Van inkooporder: een concept factuur zal gegenereerd worden op basis van de "
-"inkooporder. De financiële man hoeft deze dan alleen nog maar goed te "
-"keuren./n\"\"Van ontvangst: er wordt geen inkoopfactuur gegenereerd. De "
-"financiële man zal deze handmatig moeten maken"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr "Facturatie gebaseerd op leveringen"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr "Netto-prijs"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr "Orderregel"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr "Bevestigd"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr "Bon"
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr "Bevestig"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr "Factuurcontrole"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr "Offerte-aanvraag"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr "Wachten"
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr "Pakbon"
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magazijn"
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr "Orderregels"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr "Bevestig inkooporder vanuit inkoopaanvraag"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr "Fax:"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr "Bedrag voor belastingen"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr "Verwachte datum"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr "Afleveradres :"
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr "Inkoopprijslijst"
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr "Geplande datum"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr "Goedgekeurd door leverancier"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr "Verpakking"
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr "Verzamel inkooporders"
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr "Gereserveerde bestemming"
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr "Order referentie"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr "Gereed"
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr "Prijslijst"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr "Wanneer inkoopfacturen worden gecontroleerd op basis van orders."
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML, kan overzicht niet weergeven!"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr ""
-"Concept-inkoopfactuur om ontvangsten te controleren op basis van order."
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr "Factureer op basis van inkoop"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr "Paklijst is aangemaakt voor de ontvangstcontrole."
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr "Handmatig"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr "Bevestig inkoop"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr "Keur inkooporder goed na bevestiging"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr "Verzenduitzondering"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr "Handmatig aangepast door de gebruiker"
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-"Dit is een berekende minimale geplande datum van alle inkooporderregels."
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Inkooporders"
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-"Voeg een adres toe wanneer je direct vanaf de leverancier richting de klant "
-"wilt leveren. Dit zorgt er voor dat het product niet via de eigen voorraad "
-"zal gaan lopen."
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr "Inkoopofferte-aanvraag :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr "Bevestig inkooporder van inkoopaanvraag"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr "Bevestig Inkooporder"
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr ""
-"Dit is een lijst van pakbonnen welke zijn gegenereerd op basis van deze "
-"inkoop"
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr "Inkoopbeheer"
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr "Partner Ref."
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr "Belastingen :"
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr "Gefactureerd"
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr "Bestemmingsadres"
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr "Inkooporderregel"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr "Kalenderoverzicht"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr "Naar Concept"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr "Inkooporder is goedgekeurd door de leverancier"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr "concept-factuur"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr "Inkooporder"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr "Inkoopaanvraag wordt voorgesteld door het systeem"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr "Pakbon"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr "Maak factuur op basis van de pakbonnen"
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr "Datum waarop dit document gemaakt is."
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr "Levering & Facturen"
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr "Datum"
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-"Referente op het document welke wordt gegenereerd voor deze inkoopofferte-"
-"aanvraag"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr "Tel. :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr "Creëer inkoopfactuur na inkooporder"
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr "Datum Toegezegd"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr "Onze order referentie"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr "BTW"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr "Bereken"
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "U kunt geen twee overlappende prijslijsten hebben!"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr "Verwijder Inkooporder"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr "Maak pakbonnen"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr "Totaal :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr "Wanneer de inkoop is goedgekeurd, wordt de pakbon gecreëerd."
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr "Historie"
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr "Order status"
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr "Subtotaal"
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr "Wachten"
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr "Standaard versie inkoop prijslijst"
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Eenheidsprijs"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
@@ -685,181 +1225,349 @@ msgid "Fiscal Position"
 msgstr "Fiscale situatie"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr "Verzoek om offerte nr."
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr "Factuur"
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr "Annuleer"
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
-msgstr "Inkoop instellingen"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
-msgstr "Order Ref"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr "Inkooporders"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr "Verzamel inkooporders"
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
 msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
-msgstr "Nieuwe inkooporder"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
-msgstr "Ontvangen"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr "Inkoopofferte-aanvraag"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
-msgstr "Uitgaande packing"
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr "Tel. :"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
-msgstr "Beheer facturen op ontvangsten"
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr "Onze order referentie"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magazijn"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr "Datum aanvraag:"
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr "Datum goedgekeurd"
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
-msgstr ""
-"Module voor inkoopbeheer\n"
-"     Offerteaanvragen, leveranciersfacturen, Afdrukken van opdrachten..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
+msgstr "Inkooporder kan niet geannuleerd worden."
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Eenheidsprijs"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr "Product"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr "Omschrijving"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
-msgstr "Product-ontvangst factuur"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr "Verwacht leveradres"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
-msgstr "Nog goedgekeurd te worden inkooporders"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
-msgstr "Bevestig inkooporder"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr "Levering"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr "Product eenh."
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr "Hvhd"
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr "Reservering"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
-msgstr "Inkooporder is goedgekeurd door de gebruiker."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
+msgstr "Inkooporder kan niet worden geannuleerd!"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
-msgstr "Inkoopfactuur"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr "Eigen orderreferentie"
 
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr "Bestelopdracht bevestigingsnr."
-
 #. module: purchase
 #: view:purchase.order:0
-msgid "Total amount"
-msgstr "Totaalbedrag"
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
+msgstr "Verwachte datum"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr "BTW"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr "Besteldatum"
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr "Afleveradres :"
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr "Inkoopcontrole"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
-msgstr "Inkoopofferte-aanvraag"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr "Inkoopprijslijst"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -872,14 +1580,32 @@ msgid "Approve"
 msgstr "Goedkeuren"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
-msgstr "Bevestigde inkopen"
+#: view:purchase.order:0
+msgid "To Approve"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
-msgstr "Maak factuur vanaf pakbonnen"
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -887,58 +1613,282 @@ msgid "Total"
 msgstr "Totaal"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr "Ben je er zeker van dat je deze orders wilt samenvoegen?"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
-msgstr "Goedkeuren inkooporder"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr "BTW"
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
-msgstr ""
-"Na goedkeuring inkooporder, de concept-inkoopfactuur wordt aangemaakt."
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
-msgstr "Goederenstromen"
-
-#. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr "Bedrag voor belastingen"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
+
+#. module: purchase
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr ""
+
+#~ msgid "Product recept invoice"
+#~ msgstr "Product-ontvangst factuur"
+
+#~ msgid "Packing Invoice"
+#~ msgstr "Pakbon"
+
+#~ msgid "Out Packing"
+#~ msgstr "Uitgaande packing"
+
+#~ msgid "Supplier Invoice pre-generated on receptions for control"
+#~ msgstr ""
+#~ "Concept-inkoopfactuur aangemaakt om binnenkomende goederen te controleren."
+
+#~ msgid "Packing"
+#~ msgstr "Verpakking"
+
+#~ msgid "Confirmed Purchase"
+#~ msgstr "Goedgekeurde inkoop"
+
+#~ msgid "Create invoice from product recept"
+#~ msgstr "Maak factuur op basis van productontvangst"
+
+#~ msgid "Purchase Orders in Progress"
+#~ msgstr "Lopende inkooporders"
+
+#~ msgid "Purchase order is confirmed by the user."
+#~ msgstr "Inkooporder is goedgekeurd door de gebruiker."
+
+#~ msgid "Purchase Order lines"
+#~ msgstr "Inkooporderregels"
+
+#~ msgid ""
+#~ "From Order: a draft invoice will be pre-generated based on the purchase "
+#~ "order. The accountant will just have to validate this invoice for control.\n"
+#~ "From Picking: a draft invoice will be pre-genearted based on validated "
+#~ "receptions.\n"
+#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
+#~ "manually."
+#~ msgstr ""
+#~ "Van inkooporder: een concept factuur zal gegenereerd worden op basis van de "
+#~ "inkooporder. De financiële man hoeft deze dan alleen nog maar goed te "
+#~ "keuren./n\"\"Van ontvangst: er wordt geen inkoopfactuur gegenereerd. De "
+#~ "financiële man zal deze handmatig moeten maken"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Facturatie gebaseerd op leveringen"
+
+#~ msgid "Product Receipt"
+#~ msgstr "Bon"
+
+#~ msgid "Confirm Purchase order from Request for quotation without origin"
+#~ msgstr "Bevestig inkooporder vanuit inkoopaanvraag"
+
+#~ msgid "Planned Date"
+#~ msgstr "Geplande datum"
+
+#~ msgid "Merge purchases"
+#~ msgstr "Verzamel inkooporders"
+
+#~ msgid "When controlling invoice from orders"
+#~ msgstr "Wanneer inkoopfacturen worden gecontroleerd op basis van orders."
+
+#~ msgid "Pre-generated supplier invoice to control based on order"
+#~ msgstr ""
+#~ "Concept-inkoopfactuur om ontvangsten te controleren op basis van order."
+
+#~ msgid "Invoice from Purchase"
+#~ msgstr "Factureer op basis van inkoop"
+
+#~ msgid "Packing is created for the products reception control."
+#~ msgstr "Paklijst is aangemaakt voor de ontvangstcontrole."
+
+#~ msgid "Confirming Purchase"
+#~ msgstr "Bevestig inkoop"
+
+#~ msgid "Approve Purchase order after Confirming"
+#~ msgstr "Keur inkooporder goed na bevestiging"
+
+#~ msgid "Encoded manually by the user."
+#~ msgstr "Handmatig aangepast door de gebruiker"
+
+#~ msgid "Purchase orders"
+#~ msgstr "Inkooporders"
+
+#~ msgid "Confirm Purchase order from Request for quotation"
+#~ msgstr "Bevestig inkooporder van inkoopaanvraag"
+
+#~ msgid "Confirm Purchase Order"
+#~ msgstr "Bevestig Inkooporder"
+
+#~ msgid "Partner Ref."
+#~ msgstr "Partner Ref."
+
+#~ msgid "Purchase order is approved by supplier."
+#~ msgstr "Inkooporder is goedgekeurd door de leverancier"
+
+#~ msgid "Purchase order"
+#~ msgstr "Inkooporder"
+
+#~ msgid "Request for quotation is proposed by the system."
+#~ msgstr "Inkoopaanvraag wordt voorgesteld door het systeem"
+
+#~ msgid "Creates invoice from packin list"
+#~ msgstr "Maak factuur op basis van de pakbonnen"
+
+#~ msgid "Delivery & Invoices"
+#~ msgstr "Levering & Facturen"
+
+#~ msgid "After Purchase order , Create invoice."
+#~ msgstr "Creëer inkoopfactuur na inkooporder"
+
+#~ msgid "Scheduled date"
+#~ msgstr "Datum Toegezegd"
+
+#~ msgid "Create Packing list"
+#~ msgstr "Maak pakbonnen"
+
+#~ msgid "When purchase order is approved , it creates its packing list."
+#~ msgstr "Wanneer de inkoop is goedgekeurd, wordt de pakbon gecreëerd."
+
+#~ msgid "Invoice from Packing list"
+#~ msgstr "Factureer op basis van pakbonnen"
+
+#~ msgid "Order Status"
+#~ msgstr "Order status"
+
+#~ msgid "Purchases Properties"
+#~ msgstr "Inkoop instellingen"
+
+#~ msgid "Order Ref"
+#~ msgstr "Order Ref"
+
+#~ msgid "New Purchase Order"
+#~ msgstr "Nieuwe inkooporder"
+
+#~ msgid "Confirming Purchase Order"
+#~ msgstr "Bevestig inkooporder"
+
+#~ msgid "Purchase Invoice"
+#~ msgstr "Inkoopfactuur"
+
+#~ msgid "Request For Quotations"
+#~ msgstr "Inkoopofferte-aanvraag"
+
+#~ msgid "Approved Purchase"
+#~ msgstr "Bevestigde inkopen"
+
+#~ msgid "From Packing list, Create invoice."
+#~ msgstr "Maak factuur vanaf pakbonnen"
+
+#~ msgid "Approving Purchase Order"
+#~ msgstr "Goedkeuren inkooporder"
+
+#~ msgid "After approved purchase order , it comes into the supplier invoice"
+#~ msgstr ""
+#~ "Na goedkeuring inkooporder, de concept-inkoopfactuur wordt aangemaakt."
+
+#~ msgid "Purchase Process"
+#~ msgstr "Inkoopproces"
+
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "U kunt geen twee overlappende prijslijsten hebben!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ongeldige modelnaam in de actie-definitie."
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid ""
+#~ "Module for purchase management\n"
+#~ "    Request for quotation, Create Supplier Invoice, Print Order..."
+#~ msgstr ""
+#~ "Module voor inkoopbeheer\n"
+#~ "     Offerteaanvragen, leveranciersfacturen, Afdrukken van opdrachten..."
+
+#~ msgid "Control invoices on receptions"
+#~ msgstr "Beheer facturen op ontvangsten"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
+
+#~ 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!"
diff --git a/addons/purchase/i18n/nl_BE.po b/addons/purchase/i18n/nl_BE.po
index 2e08db3ead4..df105d6673f 100644
--- a/addons/purchase/i18n/nl_BE.po
+++ b/addons/purchase/i18n/nl_BE.po
@@ -6,29 +6,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-04-10 09:33+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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,location_id:0
-msgid "Destination"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
 msgstr ""
 
 #. module: purchase
@@ -37,43 +60,99 @@ msgid "From Picking"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr ""
 
@@ -83,8 +162,16 @@ msgid "Default Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
 msgstr ""
 
 #. module: purchase
@@ -95,15 +182,10 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -112,13 +194,14 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
 msgstr ""
 
 #. module: purchase
@@ -127,20 +210,27 @@ msgid "Approve Purchase"
 msgstr ""
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
 msgstr ""
 
 #. module: purchase
@@ -152,15 +242,26 @@ msgid "Notes"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -168,20 +269,886 @@ msgid "Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr ""
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+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."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr ""
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -193,467 +1160,41 @@ msgid ""
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr ""
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr ""
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr ""
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr ""
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr ""
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
 msgstr ""
 
 #. module: purchase
@@ -662,178 +1203,348 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr ""
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr ""
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
 msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr ""
 
 #. module: purchase
-#: 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 karakters bevatten !"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
+#: report:purchase.order:0
+msgid "Tél. :"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
 msgstr ""
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr ""
 
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
-msgid "Total amount"
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
@@ -847,13 +1558,31 @@ msgid "Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
+#: view:purchase.order:0
+msgid "To Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
 msgstr ""
 
 #. module: purchase
@@ -862,57 +1591,100 @@ msgid "Total"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
 msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: view:purchase.order:0
+msgid "Untaxed amount"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
 msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr ""
+
+#~ 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 karakters bevatten !"
diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po
index 51db52b019a..e8858e296fd 100644
--- a/addons/purchase/i18n/pl.po
+++ b/addons/purchase/i18n/pl.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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-28 19:32+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-11-29 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -36,11 +36,6 @@ msgstr "Nie możesz potwierdzić zamówienia zakupu bez pozycji."
 msgid "Invoiced & Paid"
 msgstr "Zafakturowane i zapłacone"
 
-#. module: purchase
-#: report:purchase.quotation:0
-msgid "Regards,"
-msgstr "Pozdrowienia,"
-
 #. module: purchase
 #: field:purchase.order,location_id:0
 #: view:purchase.report:0
@@ -78,11 +73,6 @@ msgstr "Adres docelowy"
 msgid "Validated By"
 msgstr "Zatwierdzone przez"
 
-#. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
 #. module: purchase
 #: view:purchase.order:0
 #: field:purchase.order,partner_id:0
@@ -504,16 +494,14 @@ msgid "Invoice Control"
 msgstr "Wystawianie faktur"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Request for Quotations."
-msgstr "Zapytanie ofertowe"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr "Zap. Ofert."
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr "Odnośnik dostawcy"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -591,11 +579,6 @@ msgstr "Suma"
 msgid "To be Invoiced"
 msgstr "Do zafakturowania"
 
-#. module: purchase
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "ID certyfikatu modułu musi być unikalne !"
-
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
 msgid "Address Contact Name"
@@ -655,11 +638,6 @@ msgstr ""
 "Analiza zakupu pozwala sprawdzać i analizować historię zakupów i postęp. Z "
 "tego menu możesz śledzić postępy negocjacji, postępy dostaw itp."
 
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "Nie możesz mieć 2 cenników, które na siebie zachodzą !"
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved by Supplier"
@@ -737,9 +715,10 @@ msgid "Validated by"
 msgstr "Zatwierdzone przez"
 
 #. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "Zap. Ofert."
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
@@ -764,11 +743,6 @@ msgstr "    Miesiąc-1    "
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr "Brak dziennika zakupów dla tej firmy: \"%s\" (id:%d)"
 
-#. module: purchase
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "Reguła musi mieć zaznaczone co najmniej jedno prawo dostępu !"
-
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Manual"
@@ -876,22 +850,10 @@ msgid "Month"
 msgstr "Miesiąc"
 
 #. module: purchase
-#: help:purchase.order,state:0
-msgid ""
-"The state of the purchase order or the quotation request. A quotation is a "
-"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
-"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
-"order to change the state to 'Approved'. When the purchase order is paid and "
-"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
-"or in the reception of goods, the state becomes in exception."
-msgstr ""
-"Stan zamówienia zakupu lub zapytania ofertowego. Zapytanie ofertowe jest "
-"zamówieniem zakupu w stanie 'Projekt'. Następnie zamówienie może być "
-"potwierdzone i jego stan zmieni się w 'Potwierdzone'. Następnie po "
-"zaaprobowaniu przez dostawcę stan zmienia się w 'Zaaprobowane'. Kiedy "
-"zamówienie jest zrealizowane i zapłacone stan zmienia się na 'Wykonano'. "
-"Jeśli wystąpi operacja anulowania w trakcie fakturowania lub przyjmowania "
-"towarów, to stan zmieni się na Wyjątek."
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr "Oczekuje potwierdzenia dostawcy"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -909,11 +871,6 @@ msgstr "Zamówienia zakupu oczekujące na aprobowanie"
 msgid "Total Untaxed amount"
 msgstr "Suma kwot netto"
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "The supplier approves the Purchase Order."
-msgstr "Dostawca aprobuje zamówienie zakupu"
-
 #. module: purchase
 #: field:purchase.order,shipped:0
 #: field:purchase.order,shipped_rate:0
@@ -994,6 +951,11 @@ msgstr "Utwórz faktury"
 msgid "Purchase Order Line"
 msgstr "Pozycja zamówienia zakupu"
 
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Calendar View"
@@ -1005,12 +967,11 @@ msgid "Purchase Order Merge"
 msgstr "Złącz zamówienia zakupu"
 
 #. module: purchase
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Pozdrowienia,"
 
 #. module: purchase
-#: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
 #: view:purchase.report:0
 msgid "Negotiation by Supplier"
@@ -1062,6 +1023,11 @@ msgstr "Sierpień"
 msgid "Qty. per product"
 msgstr "Il. na produkt"
 
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -1077,11 +1043,6 @@ msgstr "Sprzedaż i zakupy"
 msgid "June"
 msgstr "Czerwiec"
 
-#. module: purchase
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "Nazwa grupy musi być unikalna !"
-
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
@@ -1179,9 +1140,9 @@ msgid "Cancel Purchase Order"
 msgstr "Anuluj zamówienie zakupu"
 
 #. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Supplier Reference"
-msgstr "Odnośnik dostawcy"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -1199,15 +1160,6 @@ msgstr "Konsola"
 msgid "Products Value"
 msgstr "Wartość produktów"
 
-#. module: purchase
-#: constraint:product.pricelist.item:0
-msgid ""
-"Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
-"Item!"
-msgstr ""
-"Błąd ! Nie możesz powiązać głównego cennika jako innego cennika w elemencie "
-"cennika!"
-
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
@@ -1248,9 +1200,22 @@ msgstr ""
 "Nr dokumentu, który wygenerował zapotrzebowanie na to zamówienia zakupu."
 
 #. module: purchase
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Nazwa modułu musi być unikalna !"
+#: help:purchase.order,state:0
+msgid ""
+"The state of the purchase order or the quotation request. A quotation is a "
+"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
+"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
+"order to change the state to 'Approved'. When the purchase order is paid and "
+"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
+"or in the reception of goods, the state becomes in exception."
+msgstr ""
+"Stan zamówienia zakupu lub zapytania ofertowego. Zapytanie ofertowe jest "
+"zamówieniem zakupu w stanie 'Projekt'. Następnie zamówienie może być "
+"potwierdzone i jego stan zmieni się w 'Potwierdzone'. Następnie po "
+"zaaprobowaniu przez dostawcę stan zmienia się w 'Zaaprobowane'. Kiedy "
+"zamówienie jest zrealizowane i zapłacone stan zmienia się na 'Wykonano'. "
+"Jeśli wystąpi operacja anulowania w trakcie fakturowania lub przyjmowania "
+"towarów, to stan zmieni się na Wyjątek."
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
@@ -1327,9 +1292,9 @@ msgid "Purchase Order Lines"
 msgstr "Pozycje zamówienia zakupu"
 
 #. module: purchase
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Rozmiar pola nie może być mniejszy od 1 !"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr "Dostawca aprobuje zamówienie zakupu"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
@@ -1349,14 +1314,6 @@ msgstr "Dokument źródłowy"
 msgid "Merge orders"
 msgstr "Połącz zamówienia"
 
-#. module: purchase
-#: 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: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
@@ -1409,6 +1366,12 @@ msgstr "Wyszukaj zamówienia zakupu"
 msgid "Warehouse"
 msgstr "Magazyn"
 
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr "Zapytanie ofertowe"
+
 #. module: purchase
 #: report:purchase.order:0
 msgid "Date Req."
@@ -1426,12 +1389,6 @@ msgstr "Data aprobowania"
 msgid "Could not cancel this purchase order !"
 msgstr "Nie można anulować tego zamówienia zakupu !"
 
-#. module: purchase
-#: selection:purchase.order,state:0
-#: selection:purchase.report,state:0
-msgid "Waiting Supplier Ack"
-msgstr "Oczekuje potwierdzenia dostawcy"
-
 #. module: purchase
 #: report:purchase.order:0
 #: field:purchase.order.line,price_unit:0
@@ -1721,11 +1678,6 @@ msgstr "Suma"
 msgid "Addresses"
 msgstr "Adresy"
 
-#. module: purchase
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Reguły nie są obsługiwane dla obiektów osv_memory !"
-
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
@@ -1820,6 +1772,15 @@ msgstr ""
 msgid "Purchase Dashboard"
 msgstr "Konsola zakupów"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#~ 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 "Purchase Process"
 #~ msgstr "Proces zakupu"
 
@@ -1967,9 +1928,22 @@ msgstr "Konsola zakupów"
 #~ msgid "Out Packing"
 #~ msgstr "Przesunięcia wychodzące"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
 #~ msgid "Date"
 #~ msgstr "Data"
 
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "Nie możesz mieć 2 cenników, które na siebie zachodzą !"
+
+#~ msgid ""
+#~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
+#~ "Item!"
+#~ msgstr ""
+#~ "Błąd ! Nie możesz powiązać głównego cennika jako innego cennika w elemencie "
+#~ "cennika!"
+
 #~ msgid "Supplier Invoice pre-generated on receptions for control"
 #~ msgstr "Faktura dostawcy wygenerowana przy przyjęciu dla kontroli"
 
@@ -1984,3 +1958,24 @@ msgstr "Konsola zakupów"
 
 #~ msgid "Waiting Schedule"
 #~ msgstr "Czeka na planowanie"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "ID certyfikatu modułu musi być unikalne !"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "Reguła musi mieć zaznaczone co najmniej jedno prawo dostępu !"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "Nazwa grupy musi być unikalna !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Nazwa modułu musi być unikalna !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Rozmiar pola nie może być mniejszy od 1 !"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Reguły nie są obsługiwane dla obiektów osv_memory !"
diff --git a/addons/purchase/i18n/pt.po b/addons/purchase/i18n/pt.po
index f72b30505f7..156ac33de50 100644
--- a/addons/purchase/i18n/pt.po
+++ b/addons/purchase/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-12 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po
index a084560b343..75475336db1 100644
--- a/addons/purchase/i18n/pt_BR.po
+++ b/addons/purchase/i18n/pt_BR.po
@@ -7,74 +7,157 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-01 06:56+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: <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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr "Faturamento & Pago"
 
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
-msgstr "Fatura do fornecedor pré-gerada nos recebimentos para controle"
-
 #. module: purchase
 #: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
 msgid "Destination"
 msgstr "Local Destino"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+"Deve-se selecionar uma UdM do produto da mesma categoria que a UdM de compra "
+"do produto"
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
 msgstr "From Picking"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr "Endereço de Entrega"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr "Validado Por"
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome do modelo inválido na definição da ação."
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr "Fornecedor"
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
-msgstr "Eentrega"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr "Deseja gerar a(s) Nota(s) de Entrada ?"
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr "Purchase Orders Statistics"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr "From a Pick list"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
+msgstr "Sem Lista de Preços !"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr "Quantidade"
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
-msgstr "Da Ordem"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
+msgstr "Selecionar uma Ordem de venda Aberta"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
-msgstr "Compra Confirmada"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr "This is the leads/security time for each purchase order."
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr "Voltar para Rascunho"
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr "Pendência no Faturamento"
 
@@ -84,9 +167,20 @@ msgid "Default Purchase Pricelist"
 msgstr "Lista de Preço de Compras Padrão"
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
-msgstr "Criar Nota Fiscal"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr "Ordens de Compras Atuais"
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -98,15 +192,10 @@ msgstr ""
 "the current partner"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr "Fax :"
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr "Criar Nota Fiscal no Recebimento de Produtos"
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -117,14 +206,15 @@ msgstr ""
 "computes the supplier price for the selected products/quantities."
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
-msgstr "Processo de Compras"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
-msgstr "Faturar a partir da lista de Separação"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -132,21 +222,28 @@ msgid "Approve Purchase"
 msgstr "Aprovar Compra"
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr "Aprovada"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
-msgstr "Ordem de Compra em Progresso"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr "Compras"
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Total de Produtos"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr "Movimentação de Estoque"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr "Análise de Recebimento"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -157,15 +254,26 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr "Impostos"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -173,20 +281,906 @@ msgid "Purchase Order"
 msgstr "Ordem de Compras"
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
-msgstr "Atenciosamente,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Ref. Ordem"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr "Net Total :"
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+msgid "Products"
+msgstr "Produtos"
+
+#. 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 "Total Qty and Amount by month"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr "Cancelada"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "Lista de Preços"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr "Pendência no Embarque"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr "Origem"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr "Recebimento de Produtos"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr "Saída de Produtos"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr "Correção Manual"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr "Referência"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr "Ordem(ns) de Compra com Status em %s não podem ser deletados"
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr "Nome e Endereço de Contato"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr "Dia"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Centro de Custo"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "# de Linhas"
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr "Purchase Analytic Plans"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr "purchase.installer"
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr "Rascunho"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr "Net Price"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "Linha da Ordem"
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr "It indicates that a picking has been done"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr "UdM do Produto errada !"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmada"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr "Preço Médio"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr "Faturamento"
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr "Ref. Fornecedor"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr "Status"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr "Tel.:"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "Lista de Separação"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr "Mesclar Ordens de Compras"
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr "Order Lines"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr "Sem Parceiro!"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr "Fax:"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr "Preço Total"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr "Address Contact Name"
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Error !"
+msgstr "Erro !"
+
+#. 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 ""
+"Deve-se selecionar um parceiro no formulário de compra!\n"
+"  Favor selecionar um parceiro antes de escolher um produto."
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr "My Board"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr "Ordem de Compra N°"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr "Aprovado pelo Fornecedor"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr "Da Ordem"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr "Criar Nota Fiscal"
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr "Reservation Destination"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Ação Inválida !"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr "Concluído"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr "Julho"
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuração"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr "Purchase by supplier"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr "Total Geral"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr "Validado Por"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "RFQ"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr "Notas Fiscais para Recebimento"
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr "An invoice generated for a purchase order"
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr "Data da Ordem"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr "Incoming products to control"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr "Aprovação"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr "Parceiro"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr "Nota Fiscal em Rascunho"
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr "Manages analytic distribution and purchase orders."
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Configuration Progress"
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr "Requisição do Compras"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr "Dias para Entrega"
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr "Aquisição"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Confirmed purchase order to invoice"
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr "Imagem"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr "Total Orders Lines by User per month"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr "Mês"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr "Aguardando Confirmação do Fornecedor"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr "Requisição para Cotação :"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr "Ordem de Compra Esperando Aprovação"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr "Total Untaxed amount"
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "Recebido"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr "List of ordered products."
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr ""
+"This is the list of picking list that have been generated for this purchase"
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr "Gestão de Compras"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr "To be reviewed by the accountant."
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr "Impostos :"
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Faturado"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr "State of the Purchase Order."
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr "Status da Ordem"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr "Criar Nota(s) Fiscai(s)"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr "Linha da Ordem de Compra"
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr "View de Calendário"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr "Mesclar Ordem de Compra"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Atenciosamente,"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr "Propriedades de Compras"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Total de Produtos"
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr "It indicates that an invoice has been paid"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr "Qtd. por produto"
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr "Date on which this document has been created."
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Compras & Vendas"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr "Junho"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr "Ordens de Compras"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Faturamento Manual"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr "Novembro"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+"No existe conta de despesas definida para este produto: \"%s\" (id:%d)"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+"Primeiro deve-se cancelar todas as faturas associadas a esta ordem  de "
+"compra."
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr "Pick list generated"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr "Pendência"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr "Outubro"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr "Janeiro"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr "Empresas"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "Cancelar Ordem de Compra"
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr "A pick list is generated to track the incoming products."
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr "Dashboard"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr "Products Value"
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr "The tax amount"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr "Cotações"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr "Ordens de Compra por Mês"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr "Histórico"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr "Days to Validate"
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+"Reference of the document that generated this purchase order request."
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -204,482 +1198,42 @@ msgstr ""
 "received, the state becomes 'Done'. If a cancel action occurs in the invoice "
 "or in the reception of goods, the state becomes in exception."
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr "Origem"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr "Recebimento de Produtos"
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr "Qtd"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr "Correção Manual"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr "Referência"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr "Tel.:"
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr "Centro de Custo"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr "Linhas da Ordem de Compra"
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr "Validado Por"
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-"Da Ordem: Uma fatura provisória será gerada com base na ordem de compra. O "
-"contador só precisa validar esta fatura para controle.\n"
-"Da Seleção da Recepção: Uma fatura provisória será gerada baseada nas "
-"recepções validadas.\n"
-"Manual: Nenhuma fatura será gerada. O contador deverá codificá-la "
-"manualmente."
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr "Faturamento baseado nas entregas"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr "Net Price"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr "Linha da Ordem"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr "Confirmada"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr "Recebimento de Produto"
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr "Faturamento"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr "RFQ"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr "Aguardando"
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr "Lista de Separação"
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr "Estoque"
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr "Order Lines"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr ""
-"Confirmar Ordem de Compra a partir da Requisição de Cotação sem origem"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr "Fax:"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr "Total de Mercadorias"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr "Data Prevista"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr "Shipping address :"
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr "Lista de Preço de Compras"
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr "Data Planejada"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr "Aprovado pelo Fornecedor"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr "Separação"
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr "Agrupar compras"
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr "Reservation Destination"
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr "Ref. Ordem"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr "Concluído"
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr "Lista de Preços"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr "Quando controlada notas fiscais pelas ordens"
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr "Notas fiscais de entredas pré-geradas em controle baseado na ordem"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr "Faturamento a partir da Compra"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr "Embalagem é criada para controle de recepção de produtos."
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr "Manual"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr "Confirmando Compra"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr "Aprovar Ordem de Compra depois da Confirmação"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr "Pendência no Embarque"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr "Codificado manualmente pelo usuário."
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Compras"
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr "Requisição para Cotação :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr "Confirmar Ordem de Compra a partir da Requisição de Cotação"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr "Confirmar Ordem de Compra"
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr ""
-"This is the list of picking list that have been generated for this purchase"
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr "Gestão de Compras"
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr "Ref do Parceiro"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr "Impostos :"
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr "Faturado"
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr "Endereço de Entrega"
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr "Linha da Ordem de Compra"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr "View de Calendário"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr "Voltar para Rascunho"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr "Ordem de compra foi aprovada pelo fornecedor."
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr "Nota Fiscal em Rascunho"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr "Ordem de Compra"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr "Requisição de Cotação é proposta pelo sistema."
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr "Faturar embalagem"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr "Criar Nota Fiscal a partir da lista de separação"
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr "Date on which this document has been created."
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr "Entrega & Faturamento"
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr "Data"
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-"Reference of the document that generated this purchase order request."
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr "Tél. :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr "Depois da Ordem de Compra, criar nota fiscal."
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr "Data Prevista"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr "Nossa Referência da Ordem de Compra"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr "TVA:"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr "Calcular"
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "You cannot have 2 pricelist versions that overlap!"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr "Cancelar Ordem de Compra"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr "Criar Lista de Separação"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr "Total :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr "Quando a Ordem de Compra for aprovada, cirar lista de separação."
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr "Histórico"
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr "Status da Ordem"
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr "Subtotal"
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr "Requisição para Cotação"
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr "Date on which purchase order has been approved"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr "Aguardando"
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr "Versão da Lista de Preço de Compras Padrão"
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Preço Unitário"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
@@ -687,182 +1241,351 @@ msgid "Fiscal Position"
 msgstr "Posição Fiscal"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr "Requisição para Cotação N°"
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr "Nota Fiscal"
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr "Dezembro"
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
-msgstr "Propriedades de Compras"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr "Linhas da Ordem de Compra"
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
-msgstr "Ref. Pedido"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr "The supplier approves the Purchase Order."
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr "Ordens de Compras"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr "Documento de Origem"
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr "Mesclar Ordens"
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"The Object name must start with x_ and not contain any special character !"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
+msgstr "Purchase Order Line Make Invoice"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
-msgstr "Nova Ordem de Compra"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr "Recebimentos"
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
-msgstr "Recebido"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr "Total Orders by User per month"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr "Requisição para Cotação"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
-msgstr "Lista de Separação de Saída"
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr "Tél. :"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
-msgstr "Controlar faturamento nos recebimentos"
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
+msgstr "Responsável"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr "Nossa Referência da Ordem de Compra"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr "Buscar Ordem de Compra"
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Estoque"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr "Requisição de Cotação."
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr "Data Req."
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr "Data da Aprovação"
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
-msgstr ""
-"Módulo para gerenciamento de compra\n"
-"     Pedido de Cotação, Criação de Fatura de Fornecedor, Impressão de "
-"Ordem..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
+msgstr "Não é possível cancelar esta ordem de compra!"
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Preço Unitário"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr "Produto"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr "Confirmation"
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr "Descrição"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
-msgstr "Fatura de recebimento de produto"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Outgoing products to invoice"
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr "Expected Delivery address:"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
-msgstr "Ordem de Compra Esperando Aprovação"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr "O total sem impostos"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
-msgstr "Confirmando Ordem de Compra"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Invoice Lines"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr "Eentrega"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr "UdM Produto"
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr "Qtd"
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr "Endereço"
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr "Reservation"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
-msgstr "Ordem de compra confirmada pelo usuário."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
+msgstr "Não foi possível cancelar a ordem de compra!"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
-msgstr "Fatura de Compra"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr "Fevereiro"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr "Análise de Compras"
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr "Sua Refêrencia da Ordem de Compra"
 
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr "Ordem de Compra N°"
-
 #. module: purchase
 #: view:purchase.order:0
-msgid "Total amount"
-msgstr "Total Geral"
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
+msgstr "Data Prevista"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr "Total price by product by state"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr "TVA:"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr "Data do Pedido"
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr "Shipping address :"
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr "Controle de Compras"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
-msgstr "Requisição para Cotações"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr "Março"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr "Purchase-Standard Price"
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr "Lista de Preço de Compras"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -875,14 +1598,39 @@ msgid "Approve"
 msgstr "Aprovar"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
-msgstr "Compra Aprovada"
+#: view:purchase.order:0
+msgid "To Approve"
+msgstr "Para Aprovação"
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
-msgstr "A partir da Lista de Separação, criar Nota Fiscal"
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr "Faturamento"
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -890,111 +1638,307 @@ msgid "Total"
 msgstr "Total"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr "Endereços"
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr "Are you sure you want to merge these orders ?"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
-msgstr "Aprovando Ordem de Compra"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr "Agrupar Por..."
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr "From a purchase order"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr "The total amount"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr "Maio"
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr "Prazo de Compras"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
-"Após aprovada a ordem de compra, transforma-se em fatura de fornecedor"
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
-msgstr "Movimentação de Estoque"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
+msgstr "Ano"
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
-msgstr "Aguardando Programação"
+#: view:purchase.installer:0
+msgid "title"
+msgstr "título"
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
-msgstr "Preço Total"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
+msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
-msgstr "Cotação"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
+msgstr "Mov. de Estoque"
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
-msgstr "Em andamento manual"
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr "Total de Mercadorias"
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
-msgstr "Em andamento"
+#: view:purchase.report:0
+msgid "Orders"
+msgstr "Ordens"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
-msgstr "Ordem(ns) de Compra com Status em %s não podem ser deletados"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
+msgstr ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
 
-#, python-format
-#~ msgid "No Pricelist !"
-#~ msgstr "Sem Lista de Preços !"
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr "Dashboard de Compras"
 
-#, python-format
-#~ msgid "Wrong Product UOM !"
-#~ msgstr "UdM do Produto errada !"
+#~ msgid "Confirm Purchase Order"
+#~ msgstr "Confirmar Ordem de Compra"
 
-#, python-format
-#~ msgid "Error !"
-#~ msgstr "Erro !"
+#~ msgid "Order Ref"
+#~ msgstr "Ref. Pedido"
 
-#, python-format
-#~ msgid "Invalid action !"
-#~ msgstr "Ação Inválida !"
+#~ msgid "Confirm Purchase order from Request for quotation without origin"
+#~ msgstr ""
+#~ "Confirmar Ordem de Compra a partir da Requisição de Cotação sem origem"
+
+#~ msgid "Planned Date"
+#~ msgstr "Data Planejada"
+
+#~ msgid "Merge purchases"
+#~ msgstr "Agrupar compras"
+
+#~ msgid "Packing is created for the products reception control."
+#~ msgstr "Embalagem é criada para controle de recepção de produtos."
+
+#~ msgid "Confirming Purchase"
+#~ msgstr "Confirmando Compra"
+
+#~ msgid "Confirm Purchase order from Request for quotation"
+#~ msgstr "Confirmar Ordem de Compra a partir da Requisição de Cotação"
+
+#~ msgid "Purchase order"
+#~ msgstr "Ordem de Compra"
+
+#~ msgid "Request for quotation is proposed by the system."
+#~ msgstr "Requisição de Cotação é proposta pelo sistema."
+
+#~ msgid "Packing Invoice"
+#~ msgstr "Faturar embalagem"
+
+#~ msgid "New Purchase Order"
+#~ msgstr "Nova Ordem de Compra"
+
+#~ msgid "Confirming Purchase Order"
+#~ msgstr "Confirmando Ordem de Compra"
+
+#~ msgid "Purchase Invoice"
+#~ msgstr "Fatura de Compra"
+
+#~ msgid "Request For Quotations"
+#~ msgstr "Requisição para Cotações"
+
+#~ msgid "Approved Purchase"
+#~ msgstr "Compra Aprovada"
+
+#~ msgid "Approving Purchase Order"
+#~ msgstr "Aprovando Ordem de Compra"
+
+#~ msgid "Supplier Invoice pre-generated on receptions for control"
+#~ msgstr "Fatura do fornecedor pré-gerada nos recebimentos para controle"
+
+#~ msgid "Confirmed Purchase"
+#~ msgstr "Compra Confirmada"
 
-#, python-format
 #~ msgid ""
-#~ "You have to select a product UOM in the same category than the purchase UOM "
-#~ "of the product"
+#~ "From Order: a draft invoice will be pre-generated based on the purchase "
+#~ "order. The accountant will just have to validate this invoice for control.\n"
+#~ "From Picking: a draft invoice will be pre-genearted based on validated "
+#~ "receptions.\n"
+#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
+#~ "manually."
 #~ msgstr ""
-#~ "Deve-se selecionar uma UdM do produto da mesma categoria que a UdM de compra "
-#~ "do produto"
+#~ "Da Ordem: Uma fatura provisória será gerada com base na ordem de compra. O "
+#~ "contador só precisa validar esta fatura para controle.\n"
+#~ "Da Seleção da Recepção: Uma fatura provisória será gerada baseada nas "
+#~ "recepções validadas.\n"
+#~ "Manual: Nenhuma fatura será gerada. O contador deverá codificá-la "
+#~ "manualmente."
 
-#, python-format
-#~ msgid "Could not cancel this purchase order !"
-#~ msgstr "Não é possível cancelar esta ordem de compra!"
+#~ msgid "Encoded manually by the user."
+#~ msgstr "Codificado manualmente pelo usuário."
 
-#, python-format
-#~ msgid "No Partner!"
-#~ msgstr "Sem Parceiro!"
-
-#, python-format
-#~ msgid "Could not cancel purchase order !"
-#~ msgstr "Não foi possível cancelar a ordem de compra!"
-
-#, python-format
-#~ msgid "You must first cancel all invoices attached to this purchase order."
+#~ msgid ""
+#~ "Module for purchase management\n"
+#~ "    Request for quotation, Create Supplier Invoice, Print Order..."
 #~ msgstr ""
-#~ "Primeiro deve-se cancelar todas as faturas associadas a esta ordem  de "
-#~ "compra."
+#~ "Módulo para gerenciamento de compra\n"
+#~ "     Pedido de Cotação, Criação de Fatura de Fornecedor, Impressão de "
+#~ "Ordem..."
 
-#, python-format
-#~ msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "No existe conta de despesas definida para este produto: \"%s\" (id:%d)"
+#~ msgid "Product recept invoice"
+#~ msgstr "Fatura de recebimento de produto"
 
 #, python-format
 #~ msgid "You must first cancel all packing attached to this purchase order."
 #~ msgstr ""
 #~ "Primeiramente deve-se cancelar todas as embalagens associadas a esta ordem "
 #~ "de compra."
+
+#~ msgid "After approved purchase order , it comes into the supplier invoice"
+#~ msgstr ""
+#~ "Após aprovada a ordem de compra, transforma-se em fatura de fornecedor"
+
+#~ msgid "Purchase Process"
+#~ msgstr "Processo de Compras"
+
+#~ msgid "Invoice from Packing list"
+#~ msgstr "Faturar a partir da lista de Separação"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome do modelo inválido na definição da ação."
+
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "You cannot have 2 pricelist versions that overlap!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalid XML for View Architecture!"
+
+#~ msgid "Delivery & Invoices"
+#~ msgstr "Entrega & Faturamento"
+
+#~ msgid "Purchase orders"
+#~ msgstr "Compras"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "The Object name must start with x_ and not contain any special character !"
+
+#~ msgid "Scheduled date"
+#~ msgstr "Data Prevista"
+
+#~ msgid "Purchase Order lines"
+#~ msgstr "Linhas da Ordem de Compra"
+
+#~ msgid "Purchase Orders in Progress"
+#~ msgstr "Ordem de Compra em Progresso"
+
+#~ msgid "Create invoice from product recept"
+#~ msgstr "Criar Nota Fiscal no Recebimento de Produtos"
+
+#~ msgid "Product Receipt"
+#~ msgstr "Recebimento de Produto"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Faturamento baseado nas entregas"
+
+#~ msgid "Packing"
+#~ msgstr "Separação"
+
+#~ msgid "Invoice from Purchase"
+#~ msgstr "Faturamento a partir da Compra"
+
+#~ msgid "Approve Purchase order after Confirming"
+#~ msgstr "Aprovar Ordem de Compra depois da Confirmação"
+
+#~ msgid "Creates invoice from packin list"
+#~ msgstr "Criar Nota Fiscal a partir da lista de separação"
+
+#~ msgid "Create Packing list"
+#~ msgstr "Criar Lista de Separação"
+
+#~ msgid "After Purchase order , Create invoice."
+#~ msgstr "Depois da Ordem de Compra, criar nota fiscal."
+
+#~ msgid "Purchase order is approved by supplier."
+#~ msgstr "Ordem de compra foi aprovada pelo fornecedor."
+
+#~ msgid "Partner Ref."
+#~ msgstr "Ref do Parceiro"
+
+#~ msgid "Out Packing"
+#~ msgstr "Lista de Separação de Saída"
+
+#~ msgid "Control invoices on receptions"
+#~ msgstr "Controlar faturamento nos recebimentos"
+
+#~ msgid "Order Status"
+#~ msgstr "Status da Ordem"
+
+#~ msgid "Purchases Properties"
+#~ msgstr "Propriedades de Compras"
+
+#~ msgid "When purchase order is approved , it creates its packing list."
+#~ msgstr "Quando a Ordem de Compra for aprovada, cirar lista de separação."
+
+#~ msgid "When controlling invoice from orders"
+#~ msgstr "Quando controlada notas fiscais pelas ordens"
+
+#~ msgid "Pre-generated supplier invoice to control based on order"
+#~ msgstr "Notas fiscais de entredas pré-geradas em controle baseado na ordem"
+
+#~ msgid "From Packing list, Create invoice."
+#~ msgstr "A partir da Lista de Separação, criar Nota Fiscal"
+
+#~ msgid "Purchase order is confirmed by the user."
+#~ msgstr "Ordem de compra confirmada pelo usuário."
+
+#~ msgid "Manual in progress"
+#~ msgstr "Em andamento manual"
+
+#~ msgid "Quotation"
+#~ msgstr "Cotação"
+
+#~ msgid "In progress"
+#~ msgstr "Em andamento"
+
+#~ msgid "Waiting Schedule"
+#~ msgstr "Aguardando Programação"
+
+#~ msgid "Date"
+#~ msgstr "Data"
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/ro.po b/addons/purchase/i18n/ro.po
index 529396eb2c3..abaa8a73c1d 100644
--- a/addons/purchase/i18n/ro.po
+++ b/addons/purchase/i18n/ro.po
@@ -6,29 +6,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-09-16 12:49+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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr "Facturat"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,location_id:0
-msgid "Destination"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
 msgstr ""
 
 #. module: purchase
@@ -37,43 +60,99 @@ msgid "From Picking"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr ""
 
@@ -83,8 +162,16 @@ msgid "Default Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
 msgstr ""
 
 #. module: purchase
@@ -95,15 +182,10 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -112,13 +194,14 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
 msgstr ""
 
 #. module: purchase
@@ -127,20 +210,27 @@ msgid "Approve Purchase"
 msgstr ""
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
 msgstr ""
 
 #. module: purchase
@@ -152,15 +242,26 @@ msgid "Notes"
 msgstr "Note"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -168,20 +269,886 @@ msgid "Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr ""
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarif"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "Linii bon comanda"
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+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."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "Livrat"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr ""
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "Anuleaza comanda"
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -193,467 +1160,41 @@ msgid ""
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr "Linii bon comanda"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr "Depozit"
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr "Tarif"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr ""
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr "Confirma comanda"
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr ""
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr ""
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr "Anuleaza comanda"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr ""
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr ""
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
 msgstr ""
 
 #. module: purchase
@@ -662,177 +1203,348 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr ""
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr "Factura"
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr ""
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
-msgstr "Ref. Comanda"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
-msgstr "Livrat"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
+#: report:purchase.order:0
+msgid "Tél. :"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Depozit"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
 msgstr ""
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr "Descriere"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr ""
 
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
-msgid "Total amount"
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr "Data comenzii"
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
@@ -846,13 +1558,31 @@ msgid "Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
+#: view:purchase.order:0
+msgid "To Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
 msgstr ""
 
 #. module: purchase
@@ -861,57 +1591,101 @@ msgid "Total"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
 msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: view:purchase.order:0
+msgid "Untaxed amount"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
 msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr ""
+
+#~ msgid "Confirm Purchase Order"
+#~ msgstr "Confirma comanda"
+
+#~ msgid "Order Ref"
+#~ msgstr "Ref. Comanda"
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index d3731e5ae4f..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-11 04:48+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/sl.po b/addons/purchase/i18n/sl.po
index fe20a5bb55a..b3a21582b4b 100644
--- a/addons/purchase/i18n/sl.po
+++ b/addons/purchase/i18n/sl.po
@@ -6,30 +6,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-11-17 10:16+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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr "Zaračunano in plačano"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
+msgstr "Cilj"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,location_id:0
-msgid "Destination"
-msgstr "Cilj"
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -37,43 +60,99 @@ msgid "From Picking"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr "Ciljni naslov"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr "Dobavitelj"
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
-msgstr "Odprema"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
+msgstr "Ni cenika!"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr "Količina"
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
 msgstr ""
 
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr "Preklopi v pripravo"
+
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr "Izjema računa"
 
@@ -83,9 +162,17 @@ msgid "Default Purchase Pricelist"
 msgstr "Privzeti nabavni cenik"
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
-msgstr "Ustvari račun"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr ""
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -97,15 +184,10 @@ msgstr ""
 "privzetega."
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr "Faks :"
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -116,13 +198,14 @@ msgstr ""
 "dobaviteljevo ceno za izbrane proizvode/količine."
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
 msgstr ""
 
 #. module: purchase
@@ -131,21 +214,28 @@ msgid "Approve Purchase"
 msgstr "Odobri nalog"
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr "Odobreno"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
-msgstr "Nabavni nalogi v teku"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Neobdavčen znesek"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -156,15 +246,26 @@ msgid "Notes"
 msgstr "Opombe"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr "Davki"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -172,20 +273,886 @@ msgid "Purchase Order"
 msgstr "Nabavni nalog"
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
-msgstr "Lepo pozdravljeni,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Sklic naloga"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr "Skupaj neto:"
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr "Preklicano"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cenik"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr "Izjema pri odpremi"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr "Izvor"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr "Sklic"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Stroškovno mesto"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr "Neto cena"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "Postavka naloga"
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr "Potrjeno"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr "Skupaj:"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr "Potrdi"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr "Nadzor izdaje računov"
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr "Tel.:"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "Prevzemni list"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr "Postavke naloga"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr "Ni partnerja!"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr "Faks:"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Error !"
+msgstr "Napaka!"
+
+#. 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:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr "Odobril dobavitelj"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr "Ustvari račun"
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr "Cilj rezervacije"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Nepravilno dejanje!"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr "Opravljeno"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr "Skupni znesek"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr "Preveril"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr "Ročno"
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr "Pripravljen račun"
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr "Nabavni nalogi, čakajoči na odobritev"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "Prejeto"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr "To je seznam prevzemnih listov, ki so bili ustvarjeni za ta nalog"
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr "Upravljanje nabave"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr "Davki:"
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Zaračunano"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr "Postavka nabavnega naloga"
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr "Pogled koledarja"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Lepo pozdravljeni,"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Neobdavčen znesek"
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr "Izračunaj"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "Prekliči nabavni nalog"
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -203,468 +1170,42 @@ msgstr ""
 "'Opravljeno'. Če pride do preklica pri računu ali sprejetju blaga, gre "
 "stanje v izjemo."
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr "Izvor"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr "Kol."
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr "Sklic"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr "DDV ID :"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr "Tel.:"
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr "Stroškovno mesto"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr "Postavke nabavnega naloga"
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr "Preveril"
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr "Neto cena"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr "Postavka naloga"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr "Potrjeno"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr "Potrdi"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr "Nadzor izdaje računov"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr "Čakajoče"
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr "Prevzemni list"
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr "Skladišče"
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr "Postavke naloga"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr "Faks:"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr "Neobdavčen znesek"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr "Naslov za odpremo:"
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr "Nabavni cenik"
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr "Odobril dobavitelj"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr "Pakiranje"
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr "Združi naloge"
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr "Cilj rezervacije"
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr "Sklic naloga"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr "Opravljeno"
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr "Cenik"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr ""
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr "Ročno"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr "Izjema pri odpremi"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Nabavni nalogi"
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr "Potrdi nabavni nalog"
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr "To je seznam prevzemnih listov, ki so bili ustvarjeni za ta nalog"
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr "Upravljanje nabave"
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr "Sklic partnerja"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr "Davki:"
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr "Zaračunano"
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr "Ciljni naslov"
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr "Postavka nabavnega naloga"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr "Pogled koledarja"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr "Preklopi v pripravo"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr "Pripravljen račun"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr "Nabavni nalog"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr "Odprema in računi"
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr "Tel. :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr "Planiran datum"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr "Izračunaj"
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr "Prekliči nabavni nalog"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr "Skupaj:"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr "Stanje naloga"
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr "Delni seštevek"
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr "Čakajoče"
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Cena enote"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
@@ -672,179 +1213,349 @@ msgid "Fiscal Position"
 msgstr "Davčna pozicija"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr ""
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr "Račun"
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr "Prekliči"
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
-msgstr "Sklic naloga"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr "Nabavni nalogi"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr "Združi naloge"
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
 msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
-msgstr "Nov nabavni nalog"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
-msgstr "Prejeto"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr "Zahtevek za ponudbo"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr "Tel. :"
+
+#. module: purchase
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
+#: report:purchase.order:0
+msgid "Our Order Reference"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Skladišče"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr "Odobreno dne"
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
 msgstr ""
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Cena enote"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr "Proizvod"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr "Opis"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
-msgstr "Nabavni nalogi, čakajoči na odobritev"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr "Odprema"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr "ME proizvoda"
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr "Kol."
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr "Rezervacija"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
+#: view:purchase.order:0
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Total amount"
-msgstr "Skupni znesek"
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr "Datum naročila"
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr "Naslov za odpremo:"
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr "Nadzor nabave"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
-msgstr "Zahtevek za ponudbo"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr "Nabavni cenik"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -857,13 +1568,31 @@ msgid "Approve"
 msgstr "Odobri"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
+#: view:purchase.order:0
+msgid "To Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
 msgstr ""
 
 #. module: purchase
@@ -872,57 +1601,145 @@ msgid "Total"
 msgstr "Skupaj"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr "Ali res želite združiti te naloge?"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr "DDV ID :"
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
 msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr "Neobdavčen znesek"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
 msgstr ""
+
+#~ msgid "Purchase Orders in Progress"
+#~ msgstr "Nabavni nalogi v teku"
+
+#~ msgid "Purchase Order lines"
+#~ msgstr "Postavke nabavnega naloga"
+
+#~ msgid "Merge purchases"
+#~ msgstr "Združi naloge"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda."
+
+#~ msgid "Purchase orders"
+#~ msgstr "Nabavni nalogi"
+
+#~ msgid "Confirm Purchase Order"
+#~ msgstr "Potrdi nabavni nalog"
+
+#~ msgid "Partner Ref."
+#~ msgstr "Sklic partnerja"
+
+#~ msgid "Purchase order"
+#~ msgstr "Nabavni nalog"
+
+#~ msgid "Delivery & Invoices"
+#~ msgstr "Odprema in računi"
+
+#~ msgid "Scheduled date"
+#~ msgstr "Planiran datum"
+
+#~ msgid "Order Status"
+#~ msgstr "Stanje naloga"
+
+#~ msgid "Order Ref"
+#~ msgstr "Sklic naloga"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
+
+#~ msgid "New Purchase Order"
+#~ msgstr "Nov nabavni nalog"
+
+#~ msgid "Request For Quotations"
+#~ msgstr "Zahtevek za ponudbo"
+
+#~ msgid "Packing"
+#~ msgstr "Pakiranje"
diff --git a/addons/purchase/i18n/sq.po b/addons/purchase/i18n/sq.po
index c2392daca58..8fea0a18294 100644
--- a/addons/purchase/i18n/sq.po
+++ b/addons/purchase/i18n/sq.po
@@ -7,29 +7,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-10 10:20+0000\n"
 "Last-Translator: mra (Open ERP) <mra@tinyerp.com>\n"
 "Language-Team: Albanian <sq@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:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,location_id:0
-msgid "Destination"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
 msgstr ""
 
 #. module: purchase
@@ -38,43 +61,99 @@ msgid "From Picking"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr ""
 
@@ -84,8 +163,16 @@ msgid "Default Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
 msgstr ""
 
 #. module: purchase
@@ -96,15 +183,10 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -113,13 +195,14 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
 msgstr ""
 
 #. module: purchase
@@ -128,20 +211,27 @@ msgid "Approve Purchase"
 msgstr ""
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
 msgstr ""
 
 #. module: purchase
@@ -153,15 +243,26 @@ msgid "Notes"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -169,20 +270,886 @@ msgid "Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr ""
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+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."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr ""
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -194,467 +1161,41 @@ msgid ""
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr ""
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr ""
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr ""
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr ""
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr ""
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
 msgstr ""
 
 #. module: purchase
@@ -663,177 +1204,348 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr ""
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr ""
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
 msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
+#: report:purchase.order:0
+msgid "Tél. :"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
 msgstr ""
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr ""
 
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
-msgid "Total amount"
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
@@ -847,13 +1559,31 @@ msgid "Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
+#: view:purchase.order:0
+msgid "To Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
 msgstr ""
 
 #. module: purchase
@@ -862,57 +1592,95 @@ msgid "Total"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
 msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: view:purchase.order:0
+msgid "Untaxed amount"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
 msgstr ""
diff --git a/addons/purchase/i18n/sr.po b/addons/purchase/i18n/sr.po
index c42b4e6f08a..ec9061f1649 100644
--- a/addons/purchase/i18n/sr.po
+++ b/addons/purchase/i18n/sr.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-15 18:44+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-15 20:34+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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-11-16 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -35,11 +35,6 @@ msgstr ""
 msgid "Invoiced & Paid"
 msgstr "Račun izdat&Plaćeno"
 
-#. module: purchase
-#: report:purchase.quotation:0
-msgid "Regards,"
-msgstr "Poštovanje,"
-
 #. module: purchase
 #: field:purchase.order,location_id:0
 #: view:purchase.report:0
@@ -76,11 +71,6 @@ msgstr "Adresa odredišta"
 msgid "Validated By"
 msgstr "Potvrđeno od"
 
-#. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Neispravan naziv modela u definiciji zadatka."
-
 #. module: purchase
 #: view:purchase.order:0
 #: field:purchase.order,partner_id:0
@@ -492,16 +482,14 @@ msgid "Invoice Control"
 msgstr "Kontrola računa"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Request for Quotations."
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr "Zahtjev za ponudu"
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -575,11 +563,6 @@ msgstr "Ukupna Cena"
 msgid "To be Invoiced"
 msgstr ""
 
-#. module: purchase
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
 msgid "Address Contact Name"
@@ -629,11 +612,6 @@ msgid ""
 "negotiation performance, the delivery performance of your suppliers, etc."
 msgstr ""
 
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "Nije moguće imati dve verzije cenovnika koje se preklapaju!"
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved by Supplier"
@@ -708,9 +686,10 @@ msgid "Validated by"
 msgstr "Overeno od strane"
 
 #. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "Zahtjev za ponudu"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
@@ -735,11 +714,6 @@ msgstr ""
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
 
-#. module: purchase
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Manual"
@@ -847,22 +821,10 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.order,state:0
-msgid ""
-"The state of the purchase order or the quotation request. A quotation is a "
-"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
-"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
-"order to change the state to 'Approved'. When the purchase order is paid and "
-"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
-"or in the reception of goods, the state becomes in exception."
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
 msgstr ""
-"Stanje nabavnog naloga ili zaheva za ponudu. Zahtjev za ponudu je nabavni "
-"nalog u formi 'Priprema'. Zatim nalog mora biti odobren od strane korisnika, "
-"čime se status prebacuje u 'Potvrđeno'. Zatim dobavljač mora potvrditi "
-"nabavni nalog i time možemo promeniti status nabavnog naloga u 'Odobreno'. "
-"Kada je je roba primljena i račun placen status se menja u 'Završeno'. "
-"Ukoliko se u jednoj od faza desi otkazivanje računa ili primke robe, status "
-"se menja u 'Izuzetak'."
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -880,11 +842,6 @@ msgstr "Nabavni nalog ceka odobrenje"
 msgid "Total Untaxed amount"
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "The supplier approves the Purchase Order."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,shipped:0
 #: field:purchase.order,shipped_rate:0
@@ -965,6 +922,11 @@ msgstr ""
 msgid "Purchase Order Line"
 msgstr "Red nabavnog naloga"
 
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Calendar View"
@@ -976,12 +938,11 @@ msgid "Purchase Order Merge"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Poštovanje,"
 
 #. module: purchase
-#: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
 #: view:purchase.report:0
 msgid "Negotiation by Supplier"
@@ -1028,6 +989,11 @@ msgstr ""
 msgid "Qty. per product"
 msgstr ""
 
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -1043,11 +1009,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: purchase
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
@@ -1139,8 +1100,8 @@ msgid "Cancel Purchase Order"
 msgstr "Otkaži nabavni nalog"
 
 #. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Supplier Reference"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
 msgstr ""
 
 #. module: purchase
@@ -1159,13 +1120,6 @@ msgstr ""
 msgid "Products Value"
 msgstr ""
 
-#. module: purchase
-#: constraint:product.pricelist.item:0
-msgid ""
-"Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
-"Item!"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
@@ -1205,9 +1159,22 @@ msgid "Reference of the document that generated this purchase order request."
 msgstr "Referenca dokumenta koji generira ovaj zahtev za narudžbenicu."
 
 #. module: purchase
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
+#: help:purchase.order,state:0
+msgid ""
+"The state of the purchase order or the quotation request. A quotation is a "
+"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
+"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
+"order to change the state to 'Approved'. When the purchase order is paid and "
+"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
+"or in the reception of goods, the state becomes in exception."
 msgstr ""
+"Stanje nabavnog naloga ili zaheva za ponudu. Zahtjev za ponudu je nabavni "
+"nalog u formi 'Priprema'. Zatim nalog mora biti odobren od strane korisnika, "
+"čime se status prebacuje u 'Potvrđeno'. Zatim dobavljač mora potvrditi "
+"nabavni nalog i time možemo promeniti status nabavnog naloga u 'Odobreno'. "
+"Kada je je roba primljena i račun placen status se menja u 'Završeno'. "
+"Ukoliko se u jednoj od faza desi otkazivanje računa ili primke robe, status "
+"se menja u 'Izuzetak'."
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
@@ -1226,20 +1193,10 @@ msgid "Date on which purchase order has been approved"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.group:0
-msgid ""
-" Please note that: \n"
-" \n"
-"   Orders will only be merged if: \n"
-"   * Purchase Orders are in draft \n"
-"   * Purchase Orders belong to the same supplier \n"
-"   * Purchase Orders are have same stock location, same pricelist \n"
-" \n"
-"    Lines will only be merged if: \n"
-"   * Order lines are exactly the same except for the product,quantity and "
-"unit \n"
-" "
-msgstr ""
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr "Čekanje"
 
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
@@ -1294,8 +1251,8 @@ msgid "Purchase Order Lines"
 msgstr ""
 
 #. module: purchase
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
 msgstr ""
 
 #. module: purchase
@@ -1316,13 +1273,6 @@ msgstr ""
 msgid "Merge orders"
 msgstr "Ujedini naloge"
 
-#. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta mora počinjati sa x_ i ne sme sadržavati specijalne znakove!"
-
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
@@ -1375,6 +1325,12 @@ msgstr ""
 msgid "Warehouse"
 msgstr "Skladište"
 
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
 #. module: purchase
 #: report:purchase.order:0
 msgid "Date Req."
@@ -1392,12 +1348,6 @@ msgstr "Datum odobrenja"
 msgid "Could not cancel this purchase order !"
 msgstr ""
 
-#. module: purchase
-#: selection:purchase.order,state:0
-#: selection:purchase.report,state:0
-msgid "Waiting Supplier Ack"
-msgstr ""
-
 #. module: purchase
 #: report:purchase.order:0
 #: field:purchase.order.line,price_unit:0
@@ -1497,12 +1447,6 @@ msgstr "Proizvod UOM"
 msgid "Qty"
 msgstr "Količina"
 
-#. module: purchase
-#: selection:purchase.order,state:0
-#: selection:purchase.report,state:0
-msgid "Waiting"
-msgstr "Čekanje"
-
 #. module: purchase
 #: field:purchase.order,partner_address_id:0
 msgid "Address"
@@ -1587,6 +1531,22 @@ msgstr ""
 msgid "April"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
 #. module: purchase
 #: field:purchase.report,product_uom:0
 msgid "Product UoM"
@@ -1651,11 +1611,6 @@ msgstr "Ukupno"
 msgid "Addresses"
 msgstr ""
 
-#. module: purchase
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
@@ -1748,6 +1703,9 @@ msgstr ""
 #~ msgid "Supplier Invoice pre-generated on receptions for control"
 #~ msgstr "Račun dobavljača pregenirisan prilikom prijema zbog kontrole"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neispravan naziv modela u definiciji zadatka."
+
 #~ msgid "Purchase Process"
 #~ msgstr "Proces nabavke"
 
@@ -1793,6 +1751,9 @@ msgstr ""
 #~ msgid "Packing"
 #~ msgstr "Pakovanje"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+
 #~ msgid "When controlling invoice from orders"
 #~ msgstr "Kada se kontroliše račun iz naloga"
 
@@ -1847,6 +1808,9 @@ msgstr ""
 #~ msgid "Packing Invoice"
 #~ msgstr "Račun pakiranja"
 
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "Nije moguće imati dve verzije cenovnika koje se preklapaju!"
+
 #~ msgid "Delivery & Invoices"
 #~ msgstr "Isporuke & Fakture"
 
@@ -1874,6 +1838,11 @@ msgstr ""
 #~ msgid "New Purchase Order"
 #~ msgstr "Novi nabavni nalog"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta mora počinjati sa x_ i ne sme sadržavati specijalne znakove!"
+
 #~ msgid "Purchases Properties"
 #~ msgstr "Postavke Nabavke"
 
diff --git a/addons/purchase/i18n/sv.po b/addons/purchase/i18n/sv.po
index c28c0446a6d..9fe2833121c 100644
--- a/addons/purchase/i18n/sv.po
+++ b/addons/purchase/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-22 20:17+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <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-11-23 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -34,11 +34,6 @@ msgstr ""
 msgid "Invoiced & Paid"
 msgstr "Fakturerad & betald"
 
-#. module: purchase
-#: report:purchase.quotation:0
-msgid "Regards,"
-msgstr "Regards,"
-
 #. module: purchase
 #: field:purchase.order,location_id:0
 #: view:purchase.report:0
@@ -77,11 +72,6 @@ msgstr "Destination Address"
 msgid "Validated By"
 msgstr "Validated By"
 
-#. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Invalid model name in the action definition."
-
 #. module: purchase
 #: view:purchase.order:0
 #: field:purchase.order,partner_id:0
@@ -494,16 +484,14 @@ msgid "Invoice Control"
 msgstr "Invoice Control"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Request for Quotations."
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr "RFQ"
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -577,11 +565,6 @@ msgstr ""
 msgid "To be Invoiced"
 msgstr ""
 
-#. module: purchase
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
 msgid "Address Contact Name"
@@ -633,11 +616,6 @@ msgid ""
 "negotiation performance, the delivery performance of your suppliers, etc."
 msgstr ""
 
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "You cannot have 2 pricelist versions that overlap!"
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved by Supplier"
@@ -712,9 +690,10 @@ msgid "Validated by"
 msgstr "Validerad av"
 
 #. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "RFQ"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
@@ -739,11 +718,6 @@ msgstr ""
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
 
-#. module: purchase
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Manual"
@@ -851,21 +825,10 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.order,state:0
-msgid ""
-"The state of the purchase order or the quotation request. A quotation is a "
-"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
-"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
-"order to change the state to 'Approved'. When the purchase order is paid and "
-"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
-"or in the reception of goods, the state becomes in exception."
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
 msgstr ""
-"The state of the purchase order or the quotation request. A quotation is a "
-"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
-"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
-"order to change the state to 'Approved'. When the purchase order is paid and "
-"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
-"or in the reception of goods, the state becomes in exception."
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -883,11 +846,6 @@ msgstr "Inköpsorder för godkännande"
 msgid "Total Untaxed amount"
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "The supplier approves the Purchase Order."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,shipped:0
 #: field:purchase.order,shipped_rate:0
@@ -969,6 +927,11 @@ msgstr ""
 msgid "Purchase Order Line"
 msgstr "Purchase Order Line"
 
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Calendar View"
@@ -980,12 +943,11 @@ msgid "Purchase Order Merge"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Regards,"
 
 #. module: purchase
-#: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
 #: view:purchase.report:0
 msgid "Negotiation by Supplier"
@@ -1032,6 +994,11 @@ msgstr ""
 msgid "Qty. per product"
 msgstr ""
 
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -1047,11 +1014,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: purchase
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
@@ -1143,8 +1105,8 @@ msgid "Cancel Purchase Order"
 msgstr "Cancel Purchase Order"
 
 #. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Supplier Reference"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
 msgstr ""
 
 #. module: purchase
@@ -1163,15 +1125,6 @@ msgstr ""
 msgid "Products Value"
 msgstr ""
 
-#. module: purchase
-#: constraint:product.pricelist.item:0
-msgid ""
-"Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
-"Item!"
-msgstr ""
-"Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
-"Item!"
-
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
@@ -1212,9 +1165,21 @@ msgstr ""
 "Reference of the document that generated this purchase order request."
 
 #. module: purchase
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
+#: help:purchase.order,state:0
+msgid ""
+"The state of the purchase order or the quotation request. A quotation is a "
+"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
+"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
+"order to change the state to 'Approved'. When the purchase order is paid and "
+"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
+"or in the reception of goods, the state becomes in exception."
 msgstr ""
+"The state of the purchase order or the quotation request. A quotation is a "
+"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
+"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
+"order to change the state to 'Approved'. When the purchase order is paid and "
+"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
+"or in the reception of goods, the state becomes in exception."
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
@@ -1291,8 +1256,8 @@ msgid "Purchase Order Lines"
 msgstr "Purchase Order Lines"
 
 #. module: purchase
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
 msgstr ""
 
 #. module: purchase
@@ -1313,13 +1278,6 @@ msgstr ""
 msgid "Merge orders"
 msgstr "Merge orders"
 
-#. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
@@ -1372,6 +1330,12 @@ msgstr ""
 msgid "Warehouse"
 msgstr "Lagerhus"
 
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
 #. module: purchase
 #: report:purchase.order:0
 msgid "Date Req."
@@ -1389,12 +1353,6 @@ msgstr "Datum godkänd"
 msgid "Could not cancel this purchase order !"
 msgstr "Could not cancel this purchase order !"
 
-#. module: purchase
-#: selection:purchase.order,state:0
-#: selection:purchase.report,state:0
-msgid "Waiting Supplier Ack"
-msgstr ""
-
 #. module: purchase
 #: report:purchase.order:0
 #: field:purchase.order.line,price_unit:0
@@ -1658,11 +1616,6 @@ msgstr "Total"
 msgid "Addresses"
 msgstr ""
 
-#. module: purchase
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
@@ -1752,9 +1705,17 @@ msgstr ""
 msgid "Purchase Dashboard"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
 #~ msgid "Supplier Invoice pre-generated on receptions for control"
 #~ msgstr "Supplier Invoice pre-generated on receptions for control"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Invalid model name in the action definition."
+
 #~ msgid "Packing"
 #~ msgstr "Packing"
 
@@ -1820,6 +1781,9 @@ msgstr ""
 #~ msgid "When controlling invoice from orders"
 #~ msgstr "When controlling invoice from orders"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalid XML for View Architecture!"
+
 #~ msgid "Pre-generated supplier invoice to control based on order"
 #~ msgstr "Pre-generated supplier invoice to control based on order"
 
@@ -1880,9 +1844,19 @@ msgstr ""
 #~ msgid "Scheduled date"
 #~ msgstr "Scheduled date"
 
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "You cannot have 2 pricelist versions that overlap!"
+
 #~ msgid "Create Packing list"
 #~ msgstr "Create Packing list"
 
+#~ msgid ""
+#~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
+#~ "Item!"
+#~ msgstr ""
+#~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
+#~ "Item!"
+
 #~ msgid "When purchase order is approved , it creates its packing list."
 #~ msgstr "When purchase order is approved , it creates its packing list."
 
diff --git a/addons/purchase/i18n/th.po b/addons/purchase/i18n/th.po
index d8b40a8e7cc..2538b421a66 100644
--- a/addons/purchase/i18n/th.po
+++ b/addons/purchase/i18n/th.po
@@ -7,29 +7,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-09-08 14:34+0000\n"
 "Last-Translator: Suparak Panyaupatump <suparak.p@almacom.co.th>\n"
 "Language-Team: Thai <th@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:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,location_id:0
-msgid "Destination"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
 msgstr ""
 
 #. module: purchase
@@ -38,43 +61,99 @@ msgid "From Picking"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr "จำนวน"
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr ""
 
@@ -84,8 +163,16 @@ msgid "Default Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
 msgstr ""
 
 #. module: purchase
@@ -96,15 +183,10 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -113,13 +195,14 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
 msgstr ""
 
 #. module: purchase
@@ -128,20 +211,27 @@ msgid "Approve Purchase"
 msgstr "อนุมัติการสั่งซื้อ"
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr "อนุมัติแล้ว"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
-msgstr "ใบสั่งซื้ออยู่ระหว่างดำเนินการ"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
 msgstr ""
 
 #. module: purchase
@@ -153,15 +243,26 @@ msgid "Notes"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr "ภาษี"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -169,20 +270,886 @@ msgid "Purchase Order"
 msgstr "ใบสั่งซื้อ"
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
-msgstr ""
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr "คำสั่งอ้างอิง"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr ""
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr "อ้างอิง"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr "หน่วยของสินค้าไม่ถูกต้อง!"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr "โทร.:"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "ใบรายการรับ/จ่ายสินค้า"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr "แฟกซ์:"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+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."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "ใบแจ้งขอใบเสนอราคา"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr ""
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -194,467 +1161,41 @@ msgid ""
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr "อ้างอิง"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr "โทร.:"
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr "ใบแจ้งขอใบเสนอราคา"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr "กำลังรอ"
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr "ใบรายการรับ/จ่ายสินค้า"
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr "แฟกซ์:"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr "คำสั่งอ้างอิง"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr ""
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr ""
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr ""
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr ""
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr "กำลังรอ"
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
 msgstr ""
 
 #. module: purchase
@@ -663,177 +1204,348 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr ""
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr ""
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
 msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
+#: report:purchase.order:0
+msgid "Tél. :"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
 msgstr ""
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr ""
 
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
-msgid "Total amount"
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
@@ -847,13 +1559,31 @@ msgid "Approve"
 msgstr "อนุมัติ"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
+#: view:purchase.order:0
+msgid "To Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
 msgstr ""
 
 #. module: purchase
@@ -862,61 +1592,98 @@ msgid "Total"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
 msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: view:purchase.order:0
+msgid "Untaxed amount"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
 msgstr ""
 
-#, python-format
-#~ msgid "Wrong Product UOM !"
-#~ msgstr "หน่วยของสินค้าไม่ถูกต้อง!"
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr ""
+
+#~ msgid "Purchase Orders in Progress"
+#~ msgstr "ใบสั่งซื้ออยู่ระหว่างดำเนินการ"
diff --git a/addons/purchase/i18n/tlh.po b/addons/purchase/i18n/tlh.po
index 1900b8e5b5d..2170783c81b 100644
--- a/addons/purchase/i18n/tlh.po
+++ b/addons/purchase/i18n/tlh.po
@@ -6,29 +6,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,location_id:0
-msgid "Destination"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
 msgstr ""
 
 #. module: purchase
@@ -37,43 +60,99 @@ msgid "From Picking"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr ""
 
@@ -83,8 +162,16 @@ msgid "Default Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
 msgstr ""
 
 #. module: purchase
@@ -95,15 +182,10 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -112,13 +194,14 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
 msgstr ""
 
 #. module: purchase
@@ -127,20 +210,27 @@ msgid "Approve Purchase"
 msgstr ""
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
 msgstr ""
 
 #. module: purchase
@@ -152,15 +242,26 @@ msgid "Notes"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -168,20 +269,886 @@ msgid "Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr ""
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+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."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr ""
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -193,467 +1160,41 @@ msgid ""
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr ""
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr ""
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr ""
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr ""
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr ""
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
 msgstr ""
 
 #. module: purchase
@@ -662,177 +1203,348 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr ""
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr ""
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
 msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
+#: report:purchase.order:0
+msgid "Tél. :"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
 msgstr ""
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr ""
 
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
-msgid "Total amount"
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
@@ -846,13 +1558,31 @@ msgid "Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
+#: view:purchase.order:0
+msgid "To Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
 msgstr ""
 
 #. module: purchase
@@ -861,57 +1591,95 @@ msgid "Total"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
 msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: view:purchase.order:0
+msgid "Untaxed amount"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
 msgstr ""
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index 57ce51bf197..12b45c9c7d2 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -6,30 +6,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 07:20+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr "Faturalanmış & Ödenmiş"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
+msgstr "Hedef"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,location_id:0
-msgid "Destination"
-msgstr "Hedef"
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -37,43 +60,99 @@ msgid "From Picking"
 msgstr "İrsaliyeden"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr "Gönderilen Adres"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr "Onaylayan"
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr "Tedarikçi"
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
-msgstr "Teslimat"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr "Miktar"
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
-msgstr "Siparişten"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
+msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
-msgstr "Onaylanan Alış"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr "Taslak olarak Ayarla"
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr "Fatura Muafiyeti"
 
@@ -83,9 +162,17 @@ msgid "Default Purchase Pricelist"
 msgstr "Varsayılan Alış Fiyat Listesi"
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
-msgstr "Fatura Oluştur"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr ""
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -95,15 +182,10 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr "Alış İrsaliyesinden Fatura Oluştur"
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -112,14 +194,15 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
-msgstr "Alış Prosesi"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
-msgstr "Çeki Listesinden Fatura"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -127,21 +210,28 @@ msgid "Approve Purchase"
 msgstr "Alış Onayla"
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr "Onaylanmış"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
-msgstr "İşlemdeki Alış Siparişleri"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Tutar"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr "Stok Hareketi"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -152,15 +242,26 @@ msgid "Notes"
 msgstr "Notlar"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr "Vergi"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -168,20 +269,886 @@ msgid "Purchase Order"
 msgstr "Satınalma Siparişi"
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
-msgstr ""
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Sipariş Referansı"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr "Net Toplam :"
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr "İptal Edildi"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "Fiyat Listesi"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr "İstisnai Sevkiyat"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr "Menşei"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr "Gelen Ürünler"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr "Referans"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Analiz Hesabı"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr "Net Fiyat"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "Sipariş Kalemi"
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr "Onaylandı"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr "Toplam :"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr "Onayla"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr "Fatura Kontrolü"
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "Hazırlık Listesi"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr "Sipariş Kalemleri"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr "Fax:"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+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."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr "Alış Siparişi Onay N°"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr "Siparişten"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr "Fatura Oluştur"
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr "Rezervasyon Yeri"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr "Bitti"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr "Toplam Tutar"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr "Onaylayan"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "Teklif İsteği"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr "Manuel"
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr "Taslak Fatura"
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr "Teklif İsteği"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr "Onay Bekleyen Alış Siparişi"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "Alınan"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr ""
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr "Satınalma Yönetimi"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr "Vergi :"
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Faturalandı"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr "Alış Sipariş Kalemi"
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr "Takvimi Göster"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Tutar"
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr "Hesapla"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "Alış Siparişini İptal Et"
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr "Geçmiş Bilgisi"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -193,468 +1160,42 @@ msgid ""
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr "Menşei"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr "Gelen Ürünler"
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr "Mik."
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr "Referans"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr "Analiz Hesabı"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr "Alış Siparişi Kalemleri"
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr "Onaylayan"
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr "Teslimata Bağlı Faturalandır"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr "Net Fiyat"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr "Sipariş Kalemi"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr "Onaylandı"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr "Onayla"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr "Fatura Kontrolü"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr "Teklif İsteği"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr "Bekliyor"
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr "Hazırlık Listesi"
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr "Depo"
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr "Sipariş Kalemleri"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr "Fax:"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr "Tutar"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr "Tahmini Tarih"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr "Sevk Adresi :"
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr "Alış Fiyat Listesi"
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr "Planlama Tarihi"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr "Sevkiyat Paketlemesi"
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr "Alışları Birleştir"
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr "Rezervasyon Yeri"
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr "Sipariş Referansı"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr "Bitti"
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr "Fiyat Listesi"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr ""
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr "Satınalmadan Faturaya"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr "Manuel"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr "Alışı Onaylayan"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr "İstisnai Sevkiyat"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Alış Siparişleri"
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr "Teklif İsteği"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr "Alış Siparişini Onayla"
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr ""
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr "Satınalma Yönetimi"
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr "Cari Kart"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr "Vergi :"
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr "Faturalandı"
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr "Gönderilen Adres"
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr "Alış Sipariş Kalemi"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr "Takvimi Göster"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr "Taslak olarak Ayarla"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr "Tedarikçinin Onayladığı Alış Siparişleri"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr "Taslak Fatura"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr "Alış Siparişi"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr "Paketleme Sevkiyat Faturası"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr "Teslimat & Faturalar"
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr "Tarih"
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr "Alış Siparişinden Sonra Fatura Yarat."
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr "Planlanan Tarih"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr "Bizim Sipariş Referansımız"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr "Hesapla"
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr "Alış Siparişini İptal Et"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr "Çeki Listesi Oluştur"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr "Toplam :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr "Geçmiş Bilgisi"
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr "Sipariş Durumu"
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr "Alt Toplam"
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr "Bekliyor"
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr "Varsayılan Alış Fiyat Listesi Vers."
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Birim Fiyat"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
@@ -662,178 +1203,349 @@ msgid "Fiscal Position"
 msgstr "Mali Durum"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr "Teklif İsteği No"
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr "Fatura"
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr "İptal"
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
-msgstr "Alış Özellikleri"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr "Alış Sipariş Kalemleri"
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
-msgstr "Sipariş Ref."
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr "Alış Siparişleri"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
-msgstr "Yeni Alış Siparişi Oluştur"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
-msgstr "Alınan"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr "Teklif İsteği"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
-msgstr "İrsaliyesiz (Paketlemesiz)"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
+#: report:purchase.order:0
+msgid "Tél. :"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr "Bizim Sipariş Referansımız"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Depo"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr "Onaylanmış Tarih"
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
 msgstr ""
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Birim Fiyat"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr "Ürün"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr "Açıklama"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
-msgstr "Ürün İrsaliye Faturası"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr "Tahmini Teslimat Adresi"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
-msgstr "Onay Bekleyen Alış Siparişi"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
-msgstr "Alış Siparişini Onaylayan"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr "Teslimat"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr "Birim"
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr "Mik."
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr "Rezervasyon"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
-msgstr "Kulanıcının Onayladığı Alış Siparişleri"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
-msgstr "Alış Faturası"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr "Sizin Sipariş Referansınız"
 
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr "Alış Siparişi Onay N°"
-
 #. module: purchase
 #: view:purchase.order:0
-msgid "Total amount"
-msgstr "Toplam Tutar"
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
+msgstr "Tahmini Tarih"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr "Sipariş Tarihi"
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr "Sevk Adresi :"
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr "Alış Kontrolü"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
-msgstr "Teklif İstekleri"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr "Alış Fiyat Listesi"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -846,14 +1558,32 @@ msgid "Approve"
 msgstr "Onayla"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
-msgstr "Onaylanmış Alış"
+#: view:purchase.order:0
+msgid "To Approve"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
-msgstr "Çeki Listesinden Fatura Oluştur."
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr "Faturalama"
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -861,57 +1591,206 @@ msgid "Total"
 msgstr "Toplam"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
-msgstr "Alış Sipariş Onaylaması"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
-msgstr "Stok Hareketi"
-
-#. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr "Tutar"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
 msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
+
+#~ msgid "Confirmed Purchase"
+#~ msgstr "Onaylanan Alış"
+
+#~ msgid "Create invoice from product recept"
+#~ msgstr "Alış İrsaliyesinden Fatura Oluştur"
+
+#~ msgid "Purchase Process"
+#~ msgstr "Alış Prosesi"
+
+#~ msgid "Invoice from Packing list"
+#~ msgstr "Çeki Listesinden Fatura"
+
+#~ msgid "Purchase Orders in Progress"
+#~ msgstr "İşlemdeki Alış Siparişleri"
+
+#~ msgid "Purchase Order lines"
+#~ msgstr "Alış Siparişi Kalemleri"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Teslimata Bağlı Faturalandır"
+
+#~ msgid "Planned Date"
+#~ msgstr "Planlama Tarihi"
+
+#~ msgid "Packing"
+#~ msgstr "Sevkiyat Paketlemesi"
+
+#~ msgid "Merge purchases"
+#~ msgstr "Alışları Birleştir"
+
+#~ msgid "Invoice from Purchase"
+#~ msgstr "Satınalmadan Faturaya"
+
+#~ msgid "Confirming Purchase"
+#~ msgstr "Alışı Onaylayan"
+
+#~ msgid "Purchase orders"
+#~ msgstr "Alış Siparişleri"
+
+#~ msgid "Confirm Purchase Order"
+#~ msgstr "Alış Siparişini Onayla"
+
+#~ msgid "Partner Ref."
+#~ msgstr "Cari Kart"
+
+#~ msgid "Purchase order is approved by supplier."
+#~ msgstr "Tedarikçinin Onayladığı Alış Siparişleri"
+
+#~ msgid "Purchase order"
+#~ msgstr "Alış Siparişi"
+
+#~ msgid "Packing Invoice"
+#~ msgstr "Paketleme Sevkiyat Faturası"
+
+#~ msgid "Delivery & Invoices"
+#~ msgstr "Teslimat & Faturalar"
+
+#~ msgid "Date"
+#~ msgstr "Tarih"
+
+#~ msgid "After Purchase order , Create invoice."
+#~ msgstr "Alış Siparişinden Sonra Fatura Yarat."
+
+#~ msgid "Scheduled date"
+#~ msgstr "Planlanan Tarih"
+
+#~ msgid "Create Packing list"
+#~ msgstr "Çeki Listesi Oluştur"
+
+#~ msgid "Order Status"
+#~ msgstr "Sipariş Durumu"
+
+#~ msgid "Purchases Properties"
+#~ msgstr "Alış Özellikleri"
+
+#~ msgid "Order Ref"
+#~ msgstr "Sipariş Ref."
+
+#~ msgid "New Purchase Order"
+#~ msgstr "Yeni Alış Siparişi Oluştur"
+
+#~ msgid "Out Packing"
+#~ msgstr "İrsaliyesiz (Paketlemesiz)"
+
+#~ msgid "Product recept invoice"
+#~ msgstr "Ürün İrsaliye Faturası"
+
+#~ msgid "Confirming Purchase Order"
+#~ msgstr "Alış Siparişini Onaylayan"
+
+#~ msgid "Purchase order is confirmed by the user."
+#~ msgstr "Kulanıcının Onayladığı Alış Siparişleri"
+
+#~ msgid "Purchase Invoice"
+#~ msgstr "Alış Faturası"
+
+#~ msgid "Request For Quotations"
+#~ msgstr "Teklif İstekleri"
+
+#~ msgid "Approved Purchase"
+#~ msgstr "Onaylanmış Alış"
+
+#~ msgid "From Packing list, Create invoice."
+#~ msgstr "Çeki Listesinden Fatura Oluştur."
+
+#~ msgid "Approving Purchase Order"
+#~ msgstr "Alış Sipariş Onaylaması"
diff --git a/addons/purchase/i18n/uk.po b/addons/purchase/i18n/uk.po
index 88566b9ad7f..512adbd2b1a 100644
--- a/addons/purchase/i18n/uk.po
+++ b/addons/purchase/i18n/uk.po
@@ -6,29 +6,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-09-08 13:43+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr "Виписано інвойс і оплачено"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,location_id:0
-msgid "Destination"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
 msgstr ""
 
 #. module: purchase
@@ -37,43 +60,99 @@ msgid "From Picking"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr "Адреса куди"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr "Кількість"
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr "Виключення інвойса"
 
@@ -83,8 +162,16 @@ msgid "Default Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
 msgstr ""
 
 #. module: purchase
@@ -97,15 +184,10 @@ msgstr ""
 "цього Партнера"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr "Факс :"
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -114,13 +196,14 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
 msgstr ""
 
 #. module: purchase
@@ -129,21 +212,28 @@ msgid "Approve Purchase"
 msgstr "Ухвалити придбання"
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr "Ухвалений"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
-msgstr "Заявка на придбання в обробці"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Сума без ПДВ"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -154,15 +244,26 @@ msgid "Notes"
 msgstr "Примітки"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr "Податки"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -170,20 +271,886 @@ msgid "Purchase Order"
 msgstr "Заявка на придбання"
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr ""
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr "Скасовано"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "Прейскурант"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr "Виключення з доставки"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr "Походження"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Аналітичний рахунок"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr "Внутрішня ціна"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "Рядок заявки"
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr "Прийнятий"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr "Підтвердити"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr "Контроль інвойса"
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "Відбірний лист"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+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."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr "Ухвалено постачальником"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr "Ціль резервування"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr "Виконано"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr "Загальна сума"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr "Затверджено"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr "Ручний"
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "Отримано"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr "Список відбірних листів, згенерований для цього придбання"
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr "Закупівлі"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Заінвойсовано"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr "Рядок заявки на придбання"
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Сума без ПДВ"
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr "Розрахувати"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "Скасувати заявку"
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -201,468 +1168,42 @@ msgstr ""
 "на придбання оплачена і отримана, стан стає 'Виконаний'. Якщо трапилася дія "
 "скасування в інвойсі або в прийомі товарів, стан стає виключним."
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr "Походження"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr "К-сть"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr "Код платника ПДВ :"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr "Аналітичний рахунок"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr "Затверджено"
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr "Внутрішня ціна"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr "Рядок заявки"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr "Прийнятий"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr "Підтвердити"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr "Контроль інвойса"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr "Очікування"
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr "Відбірний лист"
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr "Склад"
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr "Сума без податку"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr "Адреса доставки :"
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr "Прейскурант придбання"
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr "Ухвалено постачальником"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr "Об'єднати придбання"
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr "Ціль резервування"
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr "Виконано"
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr "Прейскурант"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr ""
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури Вигляду!"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr "Ручний"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr "Виключення з доставки"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "Заявка на придбання"
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr "Затвердити заявку"
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr "Список відбірних листів, згенерований для цього придбання"
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr "Закупівлі"
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr "Пос. на партнера"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr "Заінвойсовано"
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr "Адреса куди"
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr "Рядок заявки на придбання"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr "Заявка на придбання"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr "Доставка та інвойси"
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr "Тел. :"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr "Дата поставки"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr "Розрахувати"
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr "Скасувати заявку"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr "Попередня сума"
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr "Очікування"
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Ціна одиниці"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
@@ -670,180 +1211,350 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr ""
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr "Інвойс"
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr "Скасувати"
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
-msgstr "Ордер"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr "Об'єднати замовлення"
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
-msgstr "Отримано"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr "Запит на комерційну пропозицію"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr "Тел. :"
+
+#. module: purchase
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
+#: report:purchase.order:0
+msgid "Our Order Reference"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Склад"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr "Затверджена дата"
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
 msgstr ""
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Ціна одиниці"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr "Продукт"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr "Опис"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr "ОВ продукту"
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr "К-сть"
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr "Резервування"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
+#: view:purchase.order:0
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Total amount"
-msgstr "Загальна сума"
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr "Дата заявки"
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr "Адреса доставки :"
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
+#: selection:purchase.report,month:0
+msgid "March"
 msgstr ""
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr "Прейскурант придбання"
+
 #. module: purchase
 #: field:purchase.order,invoice_method:0
 msgid "Invoicing Control"
@@ -855,13 +1566,31 @@ msgid "Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
+#: view:purchase.order:0
+msgid "To Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
 msgstr ""
 
 #. module: purchase
@@ -870,59 +1599,97 @@ msgid "Total"
 msgstr "Разом"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr "Ви впевнені"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr "Код платника ПДВ :"
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
 msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr "Сума без податку"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
 msgstr ""
 
 #~ msgid ""
@@ -934,3 +1701,38 @@ msgstr ""
 #~ "одного партнера і направляються до одного пункту призначення. Рядки будуть "
 #~ "об'єднані лише тоді, коли вони співпадають у всьому, крім кількості та "
 #~ "одиниці виміру."
+
+#~ msgid "Purchase Orders in Progress"
+#~ msgstr "Заявка на придбання в обробці"
+
+#~ msgid "Merge purchases"
+#~ msgstr "Об'єднати придбання"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильний XML для Архітектури Вигляду!"
+
+#~ msgid "Purchase orders"
+#~ msgstr "Заявка на придбання"
+
+#~ msgid "Confirm Purchase Order"
+#~ msgstr "Затвердити заявку"
+
+#~ msgid "Partner Ref."
+#~ msgstr "Пос. на партнера"
+
+#~ msgid "Purchase order"
+#~ msgstr "Заявка на придбання"
+
+#~ msgid "Delivery & Invoices"
+#~ msgstr "Доставка та інвойси"
+
+#~ msgid "Scheduled date"
+#~ msgstr "Дата поставки"
+
+#~ msgid "Order Ref"
+#~ msgstr "Ордер"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
diff --git a/addons/purchase/i18n/vi.po b/addons/purchase/i18n/vi.po
index 5a8ab6a1933..05b8e8b4e5e 100644
--- a/addons/purchase/i18n/vi.po
+++ b/addons/purchase/i18n/vi.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"
-"PO-Revision-Date: 2010-12-01 07:27+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\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-02 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -35,11 +35,6 @@ msgstr ""
 msgid "Invoiced & Paid"
 msgstr ""
 
-#. module: purchase
-#: report:purchase.quotation:0
-msgid "Regards,"
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,location_id:0
 #: view:purchase.report:0
@@ -76,11 +71,6 @@ msgstr "Địa chỉ đích"
 msgid "Validated By"
 msgstr ""
 
-#. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Tên mô hình không hợp lệ trong định nghĩa hành động."
-
 #. module: purchase
 #: view:purchase.order:0
 #: field:purchase.order,partner_id:0
@@ -486,15 +476,13 @@ msgid "Invoice Control"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Request for Quotations."
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
 msgstr ""
 
 #. module: purchase
@@ -569,11 +557,6 @@ msgstr "Giá tổng"
 msgid "To be Invoiced"
 msgstr ""
 
-#. module: purchase
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Mã chứng nhận của mô đun này phải là duy nhất !"
-
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
 msgid "Address Contact Name"
@@ -623,11 +606,6 @@ msgid ""
 "negotiation performance, the delivery performance of your suppliers, etc."
 msgstr ""
 
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "Bạn không thể có 2 phiên bản bảng giá chồng chéo nhau!"
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved by Supplier"
@@ -702,9 +680,10 @@ msgid "Validated by"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML không hợp lệ cho Kiến trúc Xem!"
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
@@ -729,11 +708,6 @@ msgstr ""
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
 
-#. module: purchase
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Manual"
@@ -805,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
@@ -839,14 +813,9 @@ msgid "Month"
 msgstr "Tháng"
 
 #. module: purchase
-#: help:purchase.order,state:0
-msgid ""
-"The state of the purchase order or the quotation request. A quotation is a "
-"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
-"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
-"order to change the state to 'Approved'. When the purchase order is paid and "
-"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
-"or in the reception of goods, the state becomes in exception."
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
 msgstr ""
 
 #. module: purchase
@@ -865,11 +834,6 @@ msgstr ""
 msgid "Total Untaxed amount"
 msgstr "Tổng số tiền không thuế"
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "The supplier approves the Purchase Order."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,shipped:0
 #: field:purchase.order,shipped_rate:0
@@ -950,6 +914,11 @@ msgstr "Tạo hóa đơn"
 msgid "Purchase Order Line"
 msgstr ""
 
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Calendar View"
@@ -961,12 +930,11 @@ msgid "Purchase Order Merge"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Lỗi ! Bạn không thể tạo trình đơn đệ quy."
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr ""
 
 #. module: purchase
-#: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
 #: view:purchase.report:0
 msgid "Negotiation by Supplier"
@@ -1013,6 +981,11 @@ msgstr "Tháng Tám"
 msgid "Qty. per product"
 msgstr ""
 
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -1028,11 +1001,6 @@ msgstr "Bán hàng & Mua hàng"
 msgid "June"
 msgstr "Tháng Sáu"
 
-#. module: purchase
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "Tên nhóm phải duy nhất !"
-
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
@@ -1058,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
@@ -1124,8 +1092,8 @@ msgid "Cancel Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Supplier Reference"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
 msgstr ""
 
 #. module: purchase
@@ -1144,15 +1112,6 @@ msgstr "Bảng điều khiển"
 msgid "Products Value"
 msgstr ""
 
-#. module: purchase
-#: constraint:product.pricelist.item:0
-msgid ""
-"Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
-"Item!"
-msgstr ""
-"Lỗi! Bạn không thể chỉ định bảng giá chính là bảng giá khác trong các mục "
-"bảng giá!"
-
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
@@ -1192,9 +1151,15 @@ msgid "Reference of the document that generated this purchase order request."
 msgstr ""
 
 #. module: purchase
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Tên của mô đun phải duy nhất !"
+#: help:purchase.order,state:0
+msgid ""
+"The state of the purchase order or the quotation request. A quotation is a "
+"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
+"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
+"order to change the state to 'Approved'. When the purchase order is paid and "
+"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
+"or in the reception of goods, the state becomes in exception."
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
@@ -1271,9 +1236,9 @@ msgid "Purchase Order Lines"
 msgstr ""
 
 #. module: purchase
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Độ dài trường dữ liệu không thể nhỏ hơn 1 !"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
@@ -1293,14 +1258,6 @@ msgstr "Tài liệu gốc"
 msgid "Merge orders"
 msgstr ""
 
-#. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Tên đối tượng phải được bắt đầu bằng x_ và không bao gồm bất kỳ ký tự đặc "
-"biệt nào!"
-
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
@@ -1353,6 +1310,12 @@ msgstr ""
 msgid "Warehouse"
 msgstr "Kho hàng"
 
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
 #. module: purchase
 #: report:purchase.order:0
 msgid "Date Req."
@@ -1370,12 +1333,6 @@ msgstr "Ngày được chấp thuận"
 msgid "Could not cancel this purchase order !"
 msgstr ""
 
-#. module: purchase
-#: selection:purchase.order,state:0
-#: selection:purchase.report,state:0
-msgid "Waiting Supplier Ack"
-msgstr ""
-
 #. module: purchase
 #: report:purchase.order:0
 #: field:purchase.order.line,price_unit:0
@@ -1639,11 +1596,6 @@ msgstr "Tổng"
 msgid "Addresses"
 msgstr "Địa chỉ"
 
-#. module: purchase
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
@@ -1654,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
@@ -1732,3 +1684,40 @@ msgstr ""
 #: model:ir.ui.menu,name:purchase.menu_board_purchase
 msgid "Purchase Dashboard"
 msgstr ""
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Tên mô hình không hợp lệ trong định nghĩa hành động."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Mã chứng nhận của mô đun này phải là duy nhất !"
+
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "Bạn không thể có 2 phiên bản bảng giá chồng chéo nhau!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML không hợp lệ cho Kiến trúc Xem!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Lỗi ! Bạn không thể tạo trình đơn đệ quy."
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "Tên nhóm phải duy nhất !"
+
+#~ msgid ""
+#~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
+#~ "Item!"
+#~ msgstr ""
+#~ "Lỗi! Bạn không thể chỉ định bảng giá chính là bảng giá khác trong các mục "
+#~ "bảng giá!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Tên của mô đun phải duy nhất !"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Tên đối tượng phải được bắt đầu bằng x_ và không bao gồm bất kỳ ký tự đặc "
+#~ "biệt nào!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Độ dài trường dữ liệu không thể nhỏ hơn 1 !"
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index a1233145af4..2b355859fd1 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/i18n/zh_CN.po
@@ -6,74 +6,153 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 09:48+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr "RFQ 必须先得到采购经理确认才能发给供货方。 RFQ 即成为确认的采购订单。"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr "采购订单无明细，你无权确认。"
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr "已开票并付清"
 
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
-msgstr "供应商发票预产生控制"
-
 #. module: purchase
 #: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
 msgid "Destination"
 msgstr "目的地"
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr "文件生成日期"
+
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
 msgstr "来自领料/提货"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr "目的地址"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr "审核人"
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr "供应商"
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
-msgstr "送货"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr "生成供货发票吗？"
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr "供货发票"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr "订货单统计数据"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
+msgstr "没有价格表！"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr "数量"
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
-msgstr "来自订单"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
+msgstr "选择一个打开的销售订单"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
-msgstr "已确定采购"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr "每个种类采购的月汇总"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr "设为草稿"
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr "发票异常"
 
@@ -83,9 +162,17 @@ msgid "Default Purchase Pricelist"
 msgstr "默认采购价格表"
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
-msgstr "创建发票"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr "正在进行的采购"
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr "如果你想直接从供应商送货到客户填入地址.这个业务个案它将删除与仓库的连接并设置客户地址"
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -95,14 +182,9 @@ msgid ""
 msgstr "这价格表将用于当前业务伙伴采购的价格表而不是默认的价格表"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
-msgstr "传真:"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr "从产品接收创建发票"
+msgstr "传真 ："
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
@@ -112,14 +194,15 @@ msgid ""
 msgstr "采购订单使用的价格表.它还计算选定产品的供应商价格/数量"
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
-msgstr "采购流程"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr "部分交货"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
-msgstr "从包装单创建发票"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
+msgstr "采购订单 '%s' 已经确认。"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -127,21 +210,28 @@ msgid "Approve Purchase"
 msgstr "批准采购"
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr "已通过"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
-msgstr "处理中的采购订单"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr "采购"
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "未完税金额"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr "库存调拨"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr "收货分析"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -152,15 +242,26 @@ msgid "Notes"
 msgstr "备注"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
-msgstr "税收"
+msgstr "税金"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -168,19 +269,885 @@ msgid "Purchase Order"
 msgstr "采购订单"
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr "订单引用"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Total :"
+msgstr "净总额："
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr "数量和金额的月汇总"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr "采购金额超过限额"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr "转换成采购订单"
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "价格表"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr "运输异常"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr "原产地"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr "入库货品"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr "出库货品"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr "手动更正"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr "   月   "
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr "引用"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr "无法删除 %s 状态的采购订单"
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr "目的地址联系人名"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr "天"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "辅助核算项目"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr "净价"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "采购订单明细"
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr "已确认"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr "合计:"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr "确认"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr "发票控制"
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr "电话:"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "分拣单"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr "订单明细"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr "传真:"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+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."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr "采购订单确认"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr "供应商通过"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr "来自订单"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr "创建发票"
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr "预定目的地"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr "完成"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr "金额合计"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr "审核人:"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "要求报价"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr "手动"
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr "发票草稿"
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr "这是计算手动采购单产品的最小计划日期"
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr "询价:"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr "等待审批的采购订单"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "已收货"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr "从领料/提货中产生采购"
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr "采购管理"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr "税:"
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "开发票"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr "采购订单明细"
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr "日程表视图"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
 msgid "Regards,"
 msgstr "问候"
 
 #. module: purchase
-#: rml:purchase.order:0
-msgid "Net Total :"
-msgstr "净合计:"
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
-msgid "Cancelled"
-msgstr "已取消"
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "未完税金额"
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr "文档的创建日期"
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr "计算"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "取消采购订单"
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr "日志"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr "参考的文档生成这个采购订单请求"
 
 #. module: purchase
 #: help:purchase.order,state:0
@@ -195,469 +1162,42 @@ msgstr ""
 "采购订单或询价的状态.询价是一个采购订单的‘草稿’状态.订单被用户确定为‘已确认’状态.然后订单的供应商必须被确定这时状态改为为‘已审批通过’.当采购订单"
 "支付和已收货,状态变为‘完成’.如果在发票或接收产品时执行取消操作,状态将变为‘异常’."
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr "来源"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr "接收产品"
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr "数量"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr "手动更正"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr "参考"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr "增值税:"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr "电话:"
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr "辅助核算项目"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr "采购订单明细"
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr "审核人:"
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-"来自订单:根据采购单预先生成发票草稿,财务人员将只是验证发票控制.   来自领料/提货:根据已经验证的接收来预先产生发票草稿.  手动:没有发票预先生成"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr "发票基于送货"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr "净价"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr "采购订单明细"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr "已确认"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr "产品收据"
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr "确认"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr "发票控制"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr "要求报价"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr "等待中"
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr "分拣单"
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr "仓库"
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr "订单明细"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr "没有询价确定采购订单"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr "传真:"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr "未完税金额"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr "预计日期"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr "运货地址:"
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr "采购价格表"
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr "计划日期"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr "供应商通过"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr "包装"
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr "合并采购"
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr "预定目的地"
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr "订单参考"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr "完成"
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr "价格表"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr "当订单控制发票时"
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr "基于订单预产生供应商发票"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr "从采购产生发票"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr "产品接收控制创建包装"
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr "手动"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr "确定采购"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr "确定后审批通过采购订单"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr "运输异常"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr "用户手动"
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr "这是计算手动采购单产品的最小计划日期"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr "采购订单"
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr "如果你想直接从供应商送货到客户填入地址.这个业务个案它将删除与仓库的连接并设置客户地址"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr "询价:"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr "从询价确定采购订单"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr "审核采购订单"
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr "从领料/提货中产生采购"
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr "采购管理"
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr "业务伙伴参考"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr "税:"
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr "开发票"
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr "目的地址"
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr "采购订单明细"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr "日程表视图"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr "草稿"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr "采购订单供应商审批通过"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr "发票草稿"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr "采购订单"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr "询价进展"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr "包装发票"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr "从包装列表创建发票"
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr "文档的创建日期"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr "送货&发票"
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr "日期"
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr "参考的文档生成这个采购订单请求"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr "电话:"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr "在采购订单后创建发票"
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr "计划日期"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr "订单参考"
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr "增值税:"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr "计算"
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "你不能有两个价格表版本它是重复的！"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr "取消采购订单"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr "创建包装单"
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr "合计:"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr "当采购订单获得批准时,它创建包装单"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr "日志"
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr "订单状态"
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr "小计"
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr "等待中"
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr "默认采购价格表版本"
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "单价"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
@@ -665,178 +1205,349 @@ msgid "Fiscal Position"
 msgstr "财务结构"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr "询价"
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr "发票"
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr "取消"
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
-msgstr "采购属性"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr "采购订单明细"
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
-msgstr "采购订单编号"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr "采购订单"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr "合并采购订单"
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
+msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
-msgstr "新的采购订单"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
-msgstr "已收货"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr "报价请求"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
-msgstr "发出的包装"
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr "电话:"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
-msgstr "控制发票在接收"
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr "订单参考"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "仓库"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr "要求日期"
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr "通过日期"
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
-msgstr "采购管理模块报价,创建供应商发票,打印单据.."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
+msgstr ""
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "单价"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr "产品"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr "说明"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
-msgstr "产品接收发票"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr "预期交货地址:"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
-msgstr "等待审批的采购订单"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
-msgstr "确定采购订单"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr "送货"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr "产品计量单位"
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr "数量"
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr "地址"
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr "预定"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
-msgstr "采购订单用户确定"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
-msgstr "采购发票"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr "你订单参考"
 
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr "采购订单确认"
-
 #. module: purchase
 #: view:purchase.order:0
-msgid "Total amount"
-msgstr "金额合计"
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
+msgstr "预计日期"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr "增值税:"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr "订购日期"
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr "运货地址:"
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr "采购控制"
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
-msgstr "询价"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr "采购价格表"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -849,14 +1560,32 @@ msgid "Approve"
 msgstr "通过"
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
-msgstr "通过采购"
+#: view:purchase.order:0
+msgid "To Approve"
+msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
-msgstr "从包装单创建发票"
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr "发票"
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -864,66 +1593,273 @@ msgid "Total"
 msgstr "合计"
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr "你确定要合并此订单吗？"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
-msgstr "通过采购订单"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr "增值税:"
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
-msgstr "采购订单审批通过后创建供应商发票"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
-msgstr "仓库调拨"
-
-#. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr "未完税金额"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
-#~ msgid "Purchase Order Lines"
+#. module: purchase
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr ""
+
+#~ msgid "Purchase Process"
+#~ msgstr "采购流程"
+
+#~ msgid "Order Status"
+#~ msgstr "订单状态"
+
+#~ msgid "Purchases Properties"
+#~ msgstr "采购属性"
+
+#~ msgid "Purchase Invoice"
+#~ msgstr "采购发票"
+
+#~ msgid "Purchase Orders in Progress"
+#~ msgstr "处理中的采购订单"
+
+#~ msgid "Merge purchases"
+#~ msgstr "合并采购"
+
+#~ msgid "Purchase orders"
+#~ msgstr "采购订单"
+
+#~ msgid "Purchase order"
+#~ msgstr "采购订单"
+
+#~ msgid "Scheduled date"
+#~ msgstr "计划日期"
+
+#~ msgid "Packing Invoice"
+#~ msgstr "包装发票"
+
+#~ msgid "Confirm Purchase Order"
+#~ msgstr "审核采购订单"
+
+#~ msgid "After Purchase order , Create invoice."
+#~ msgstr "在采购订单后创建发票"
+
+#~ msgid "Date"
+#~ msgstr "日期"
+
+#~ msgid "Order Ref"
+#~ msgstr "采购订单编号"
+
+#~ msgid "After approved purchase order , it comes into the supplier invoice"
+#~ msgstr "采购订单审批通过后创建供应商发票"
+
+#~ msgid "Supplier Invoice pre-generated on receptions for control"
+#~ msgstr "供应商发票预产生控制"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "在这动作定义中有无效的模块名"
+
+#~ msgid "Confirmed Purchase"
+#~ msgstr "已确定采购"
+
+#~ msgid "Create invoice from product recept"
+#~ msgstr "从产品接收创建发票"
+
+#~ msgid "Invoice from Packing list"
+#~ msgstr "从包装单创建发票"
+
+#~ msgid "Purchase Order lines"
 #~ msgstr "采购订单明细"
 
-#~ msgid "Invoicing"
-#~ msgstr "发票"
+#~ msgid ""
+#~ "From Order: a draft invoice will be pre-generated based on the purchase "
+#~ "order. The accountant will just have to validate this invoice for control.\n"
+#~ "From Picking: a draft invoice will be pre-genearted based on validated "
+#~ "receptions.\n"
+#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
+#~ "manually."
+#~ msgstr ""
+#~ "来自订单:根据采购单预先生成发票草稿,财务人员将只是验证发票控制.   来自领料/提货:根据已经验证的接收来预先产生发票草稿.  手动:没有发票预先生成"
 
-#~ msgid "Address"
-#~ msgstr "地址"
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "发票基于送货"
+
+#~ msgid "Product Receipt"
+#~ msgstr "产品收据"
+
+#~ msgid "Confirm Purchase order from Request for quotation without origin"
+#~ msgstr "没有询价确定采购订单"
+
+#~ msgid "Planned Date"
+#~ msgstr "计划日期"
+
+#~ msgid "Packing"
+#~ msgstr "包装"
+
+#~ msgid "When controlling invoice from orders"
+#~ msgstr "当订单控制发票时"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效XML视图结构!"
+
+#~ msgid "Pre-generated supplier invoice to control based on order"
+#~ msgstr "基于订单预产生供应商发票"
+
+#~ msgid "Invoice from Purchase"
+#~ msgstr "从采购产生发票"
+
+#~ msgid "Packing is created for the products reception control."
+#~ msgstr "产品接收控制创建包装"
+
+#~ msgid "Confirming Purchase"
+#~ msgstr "确定采购"
+
+#~ msgid "Approve Purchase order after Confirming"
+#~ msgstr "确定后审批通过采购订单"
+
+#~ msgid "Encoded manually by the user."
+#~ msgstr "用户手动"
+
+#~ msgid "Confirm Purchase order from Request for quotation"
+#~ msgstr "从询价确定采购订单"
+
+#~ msgid "Partner Ref."
+#~ msgstr "业务伙伴参考"
+
+#~ msgid "Purchase order is approved by supplier."
+#~ msgstr "采购订单供应商审批通过"
+
+#~ msgid "Request for quotation is proposed by the system."
+#~ msgstr "询价进展"
+
+#~ msgid "Creates invoice from packin list"
+#~ msgstr "从包装列表创建发票"
+
+#~ msgid "Delivery & Invoices"
+#~ msgstr "送货&发票"
+
+#~ msgid "Approved Purchase"
+#~ msgstr "通过采购"
+
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "你不能有两个价格表版本它是重复的！"
+
+#~ msgid "Create Packing list"
+#~ msgstr "创建包装单"
+
+#~ msgid "When purchase order is approved , it creates its packing list."
+#~ msgstr "当采购订单获得批准时,它创建包装单"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+
+#~ msgid "New Purchase Order"
+#~ msgstr "新的采购订单"
+
+#~ msgid "Out Packing"
+#~ msgstr "发出的包装"
+
+#~ msgid "Control invoices on receptions"
+#~ msgstr "控制发票在接收"
+
+#~ msgid ""
+#~ "Module for purchase management\n"
+#~ "    Request for quotation, Create Supplier Invoice, Print Order..."
+#~ msgstr "采购管理模块报价,创建供应商发票,打印单据.."
+
+#~ msgid "Product recept invoice"
+#~ msgstr "产品接收发票"
+
+#~ msgid "Confirming Purchase Order"
+#~ msgstr "确定采购订单"
+
+#~ msgid "Purchase order is confirmed by the user."
+#~ msgstr "采购订单用户确定"
+
+#~ msgid "Request For Quotations"
+#~ msgstr "询价"
+
+#~ msgid "From Packing list, Create invoice."
+#~ msgstr "从包装单创建发票"
+
+#~ msgid "Approving Purchase Order"
+#~ msgstr "通过采购订单"
diff --git a/addons/purchase/i18n/zh_TW.po b/addons/purchase/i18n/zh_TW.po
index 44c37b9b01e..f34607a1d6e 100644
--- a/addons/purchase/i18n/zh_TW.po
+++ b/addons/purchase/i18n/zh_TW.po
@@ -6,29 +6,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-01-30 13:18+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-10-30 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
 msgstr "已开票"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-msgid "Supplier Invoice pre-generated on receptions for control"
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,location_id:0
-msgid "Destination"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
 msgstr ""
 
 #. module: purchase
@@ -37,43 +60,99 @@ msgid "From Picking"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
 msgid "Validated By"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: purchase
+#: view:purchase.order:0
 #: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
 msgid "Supplier"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Pricelist !"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
 msgid "Quantity"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-msgid "Confirmed Purchase"
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Invoice Exception"
 msgstr ""
 
@@ -83,8 +162,16 @@ msgid "Default Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
 msgstr ""
 
 #. module: purchase
@@ -95,15 +182,10 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Fax :"
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "Create invoice from product recept"
-msgstr ""
-
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
@@ -112,13 +194,14 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase Process"
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-msgid "Invoice from Packing list"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is confirmed."
 msgstr ""
 
 #. module: purchase
@@ -127,20 +210,27 @@ msgid "Approve Purchase"
 msgstr ""
 
 #. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
 #: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
+#: selection:purchase.report,state:0
 msgid "Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action4
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
-msgid "Purchase Orders in Progress"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
 msgstr ""
 
 #. module: purchase
@@ -152,15 +242,26 @@ msgid "Notes"
 msgstr "注解"
 
 #. module: purchase
-#: rml:purchase.order:0
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
 #: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
 #: view:purchase.order:0
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
@@ -168,20 +269,886 @@ msgid "Purchase Order"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
-msgid "Regards,"
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Net Total :"
 msgstr ""
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+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"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
 msgid "Cancelled"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "价格表"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you did not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "订单行"
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+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."
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_id:0
+msgid "An invoice generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: 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 ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "已发运"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr ""
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"From the Purchase Orders menu, you can track the status of your orders: "
+"products received, invoice received and controlled.\n"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received by your supplier. "
+"OpenERP pre-generates draft of invoices based on your purchase orders or "
+"your receptions. Once you receive a supplier invoice, you can control it "
+"according to the draft of invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:0
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "取消采购订单"
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,state:0
 msgid ""
@@ -193,467 +1160,41 @@ msgid ""
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
 
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Origin"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-msgid "Incoming Products"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-#: rml:purchase.quotation:0
-msgid "Qty"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Tel.:"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-msgid "Purchase Order lines"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,validator:0
-msgid "Validated by"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid ""
-"From Order: a draft invoice will be pre-generated based on the purchase "
-"order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-genearted based on validated "
-"receptions.\n"
-"Manual: no invoice will be pre-generated. The accountant will have to encode "
-"manually."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Net Price"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr "订单行"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Product Receipt"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-msgid "Confirm"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Waiting"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-msgid "Warehouse"
-msgstr "仓库"
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Fax:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Expected Date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,minimum_planned_date:0
-msgid "Planned Date"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approved by Supplier"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Packing"
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.wizard,name:purchase.purchase_order_merge
-msgid "Merge purchases"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,name:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Done"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-msgid "Pricelist"
-msgstr "价格表"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "When controlling invoice from orders"
-msgstr ""
-
-#. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "Pre-generated supplier invoice to control based on order"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice from Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "Packing is created for the products reception control."
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirming Purchase"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "Approve Purchase order after Confirming"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: code:addons/purchase/purchase.py:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Encoded manually by the user."
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid ""
-"This is computed as the minimum scheduled date of all purchase order lines' "
-"products."
-msgstr ""
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-msgid "Purchase orders"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid ""
-"Put an address if you want to deliver directly from the supplier to the "
-"customer.In this case, it will remove the warehouse link and set the "
-"customer location."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirm Purchase order from Request for quotation"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Confirm Purchase Order"
-msgstr "确认采购订单"
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid ""
-"This is the list of picking list that have been generated for this purchase"
-msgstr ""
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
-msgid "Purchase Management"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Partner Ref."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-msgid "Purchase order is approved by supplier."
-msgstr ""
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order
-msgid "Purchase order"
-msgstr ""
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-msgid "Request for quotation is proposed by the system."
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-msgid "Packing Invoice"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "Creates invoice from packin list"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoices"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Tél. :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "After Purchase order , Create invoice."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled date"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Our Order Reference"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.quotation:0
-msgid "TVA:"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr ""
-
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr "取消采购订单"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Create Packing list"
-msgstr ""
-
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Total :"
-msgstr ""
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "When purchase order is approved , it creates its packing list."
-msgstr ""
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order,state:0
-msgid "Order Status"
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr ""
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr ""
+
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+msgid "Purchases Application Configuration"
 msgstr ""
 
 #. module: purchase
@@ -662,177 +1203,348 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
 msgid "Request for Quotation N°"
 msgstr ""
 
 #. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 #: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr "发票"
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
 #: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: wizard_button:purchase.order.merge,init,end:0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
 msgid "Cancel"
 msgstr ""
 
 #. module: purchase
-#: view:res.partner:0
-msgid "Purchases Properties"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order.line,order_id:0
-msgid "Order Ref"
-msgstr "订单参照"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr ""
 
 #. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
 msgid "Purchase Orders"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
-#: wizard_button:purchase.order.merge,init,merge:0
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
-msgid "New Purchase Order"
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
-msgstr "已发运"
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
 msgid "Request for Quotation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Out Packing"
+#: report:purchase.order:0
+msgid "Tél. :"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Control invoices on receptions"
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "仓库"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Date Req."
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
 msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid ""
-"Module for purchase management\n"
-"    Request for quotation, Create Supplier Invoice, Print Order..."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel this purchase order !"
 msgstr ""
 
 #. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"With the Requests for quotation menu you can create new request for "
+"quotations, review existing one and confirm them to order once the supplier "
+"offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
+"Purchase Order and generate the next steps: draft reception of the products, "
+"invoice to control."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 #: field:purchase.order.line,name:0
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Description"
 msgstr "说明"
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "Product recept invoice"
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.quotation:0
+#: report:purchase.quotation:0
 msgid "Expected Delivery address:"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action3
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
-msgid "Purchase Order Waiting Approval"
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-msgid "Confirming Purchase Order"
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain your relationship with them. You "
+"can track all your interactions with them through the history tab: emails, "
+"orders, meeting, etc."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
 msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
+#: view:purchase.report:0
 msgid "Product UOM"
 msgstr ""
 
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "Purchase order is confirmed by the user."
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Could not cancel purchase order !"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "Purchase Invoice"
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
 msgid "Your Order Reference"
 msgstr ""
 
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order:0
-msgid "Total amount"
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
 msgstr ""
 
 #. module: purchase
-#: rml:purchase.order:0
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
 msgid "Date Ordered"
 msgstr "订购日期"
 
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
-msgid "Request For Quotations"
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
 msgstr ""
 
 #. module: purchase
@@ -846,13 +1558,31 @@ msgid "Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-msgid "Approved Purchase"
+#: view:purchase.order:0
+msgid "To Approve"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "From Packing list, Create invoice."
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "Purchase order '%s' is cancelled."
 msgstr ""
 
 #. module: purchase
@@ -861,57 +1591,101 @@ msgid "Total"
 msgstr ""
 
 #. module: purchase
-#: wizard_view:purchase.order.merge,init:0
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
 msgstr ""
 
 #. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approving Purchase Order"
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
 msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "After approved purchase order , it comes into the supplier invoice"
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Waiting Schedule"
+#: view:purchase.installer:0
+msgid "title"
 msgstr ""
 
 #. module: purchase
-#: field:report.purchase.order.category,price_total:0
-#: field:report.purchase.order.product,price_total:0
-msgid "Total Price"
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Quotation"
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Manual in progress"
+#: view:purchase.order:0
+msgid "Untaxed amount"
 msgstr ""
 
 #. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "In progress"
+#: view:purchase.report:0
+msgid "Orders"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
 msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr ""
+
+#~ msgid "Confirm Purchase Order"
+#~ msgstr "确认采购订单"
+
+#~ msgid "Order Ref"
+#~ msgstr "订单参照"
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/purchase_view.xml b/addons/purchase/purchase_view.xml
index 7ea44c886c8..227d317bd30 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -117,7 +117,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Purchase Order">
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('supplier','=',True)]" context="{'search_default_supplier':1}" />
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1}" />
                             <field name="partner_address_id"/>
                             <field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/>
                             <field name="origin" groups="base.group_extended"/>
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 693452d4e09..966c5795b52 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -20,7 +20,7 @@
 "access_account_tax_purchase_user_manager","account.tax","account.model_account_tax","group_purchase_manager",1,0,0,0
 "access_product_product_purchase_user","product.product.purchase.user","product.model_product_product","group_purchase_user",1,0,0,0
 "access_product_product_purchase_manager","product.product.purchase.manager","product.model_product_product","group_purchase_manager",1,0,0,0
-"access_product_template_purchase_user","product.template purchase_user","product.model_product_template","group_purchase_user",1,1,1,1
+"access_product_template_purchase_user","product.template purchase_user","product.model_product_template","group_purchase_user",1,0,0,0
 "access_product_template_purchase_manager","product.template purchase_manager","product.model_product_template","group_purchase_manager",1,0,0,0
 "access_account_invoice_purchase","account_invoice purchase","account.model_account_invoice","group_purchase_user",1,1,1,1
 "access_account_invoice_line_purchase","account_invoice.line purchase","account.model_account_invoice_line","group_purchase_user",1,1,1,1
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/de.po b/addons/purchase_requisition/i18n/de.po
index 467a409158e..781964d4fa9 100644
--- a/addons/purchase_requisition/i18n/de.po
+++ b/addons/purchase_requisition/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-12-01 08:38+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:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_requisition
@@ -25,15 +25,10 @@ msgid "In Progress"
 msgstr "In Bearbeitung"
 
 #. module: purchase_requisition
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "Das Objekt muss mit x_ beginnen und darf keine Sonderzeichen haben !"
-
-#. module: purchase_requisition
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
+#, python-format
+msgid "No Product in Tender"
+msgstr "Kein Produkt in Ausschreibung"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -80,11 +75,6 @@ msgstr "Status"
 msgid "Draft"
 msgstr "Entwurf"
 
-#. module: purchase_requisition
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Supplier"
@@ -166,9 +156,9 @@ msgid "Request a Quotation"
 msgstr "Anfrage eines Angebots"
 
 #. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Multiple Requisitions"
-msgstr "Bedarfsmeldung (Multiple)"
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Erfasse Angebot"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -211,11 +201,6 @@ msgstr "Bedarfsmeldungen"
 msgid "End Date"
 msgstr "Bis Datum"
 
-#. module: purchase_requisition
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Quellcode für diese Ansicht !"
-
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition,name:0
@@ -274,9 +259,10 @@ msgid "Purchase Order"
 msgstr "Beschaffungsauftrag"
 
 #. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Beschaffung"
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
+#, python-format
+msgid "Error!"
+msgstr "Fehler!"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -299,11 +285,6 @@ msgstr "Auftragsdatum"
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#. module: purchase_requisition
-#: 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 !"
-
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "["
@@ -347,9 +328,9 @@ msgid "Reference"
 msgstr "Referenz"
 
 #. module: purchase_requisition
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Beschaffung"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,warehouse_id:0
@@ -372,14 +353,14 @@ msgid "Purchase Requisition (exclusive)"
 msgstr "Bedarfsmeldung (Exklusiv)"
 
 #. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Erfasse Angebot"
+#: selection:purchase.requisition,exclusive:0
+msgid "Multiple Requisitions"
+msgstr "Bedarfsmeldung (Multiple)"
 
 #. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Requisition"
-msgstr "Bedarfsmeldung"
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -418,23 +399,33 @@ msgid "Unassigned"
 msgstr "Nicht zugewiesen"
 
 #. module: purchase_requisition
-#: 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 !"
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Bedarfsmeldung"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,purchase_ids:0
 msgid "Purchase Orders"
 msgstr "Beschaffungsaufträge"
 
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
-#, python-format
-msgid "Error!"
-msgstr "Fehler!"
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "Das Objekt muss mit x_ beginnen und darf keine Sonderzeichen haben !"
 
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
-#, python-format
-msgid "No Product in Tender"
-msgstr "Kein Produkt in Ausschreibung"
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Quellcode für diese Ansicht !"
+
+#~ 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 certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/purchase_requisition/i18n/fr.po b/addons/purchase_requisition/i18n/fr.po
index fa23cbbe16e..0c80a57fcb2 100644
--- a/addons/purchase_requisition/i18n/fr.po
+++ b/addons/purchase_requisition/i18n/fr.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-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_requisition
diff --git a/addons/purchase_requisition/i18n/pl.po b/addons/purchase_requisition/i18n/pl.po
index e6f11ba99d3..373bd06c783 100644
--- a/addons/purchase_requisition/i18n/pl.po
+++ b/addons/purchase_requisition/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-11-18 16:13+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-27 02:46+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-11-28 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_requisition
@@ -24,17 +24,10 @@ msgid "In Progress"
 msgstr "W toku"
 
 #. module: purchase_requisition
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
+#, python-format
+msgid "No Product in Tender"
 msgstr ""
-"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-"specjalnych !"
-
-#. module: purchase_requisition
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -74,11 +67,6 @@ msgstr "Stan"
 msgid "Draft"
 msgstr "Projekt"
 
-#. module: purchase_requisition
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Supplier"
@@ -158,9 +146,9 @@ msgid "Request a Quotation"
 msgstr "Zapytanie ofertowe"
 
 #. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Multiple Requisitions"
-msgstr ""
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Utwórz ofertę"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -203,11 +191,6 @@ msgstr ""
 msgid "End Date"
 msgstr "Data końcowa"
 
-#. module: purchase_requisition
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Niewłaściwy XML dla architektury widoku!"
-
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition,name:0
@@ -261,9 +244,10 @@ msgid "Purchase Order"
 msgstr "Zamówienie Zakupu"
 
 #. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
-msgstr "Zapotrzebowanie"
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -286,11 +270,6 @@ msgstr "Data zamówienia"
 msgid "Cancelled"
 msgstr "Anulowano"
 
-#. module: purchase_requisition
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "ID certyfikatu modułu musi być unikalne !"
-
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "["
@@ -334,9 +313,9 @@ msgid "Reference"
 msgstr "Odnośnik"
 
 #. module: purchase_requisition
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Nazwa modułu musi być unikalna !"
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Zapotrzebowanie"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,warehouse_id:0
@@ -359,13 +338,13 @@ msgid "Purchase Requisition (exclusive)"
 msgstr ""
 
 #. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "Create Quotation"
-msgstr "Utwórz ofertę"
+#: selection:purchase.requisition,exclusive:0
+msgid "Multiple Requisitions"
+msgstr ""
 
 #. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Requisition"
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
 msgstr ""
 
 #. module: purchase_requisition
@@ -405,8 +384,8 @@ msgid "Unassigned"
 msgstr "Nieprzypisane"
 
 #. module: purchase_requisition
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
+#: view:purchase.order:0
+msgid "Requisition"
 msgstr ""
 
 #. module: purchase_requisition
@@ -414,14 +393,23 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr "Zamówienia Zakupu"
 
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
-#, python-format
-msgid "Error!"
-msgstr ""
+#~ 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: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
-#, python-format
-msgid "No Product in Tender"
-msgstr ""
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Niewłaściwy XML dla architektury widoku!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "ID certyfikatu modułu musi być unikalne !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Nazwa modułu musi być unikalna !"
diff --git a/addons/purchase_requisition/i18n/pt.po b/addons/purchase_requisition/i18n/pt.po
index 6d0bb120692..7f6dcd110b6 100644
--- a/addons/purchase_requisition/i18n/pt.po
+++ b/addons/purchase_requisition/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-12 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_requisition
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/i18n/ru.po b/addons/purchase_requisition/i18n/ru.po
index 9a1dba7c123..fdab5961807 100644
--- a/addons/purchase_requisition/i18n/ru.po
+++ b/addons/purchase_requisition/i18n/ru.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-09 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_requisition
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 21335eabd84..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-11-12 12:55+0000\n"
-"Last-Translator: Nicolas Bessi - Camptocamp <Unknown>\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-14 05:37+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,11 +46,21 @@ 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
 msgid "Webkit Report Samples"
-msgstr ""
+msgstr "Exemples de rapports Webkit"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
@@ -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/ar.po b/addons/sale/i18n/ar.po
index d618ca57f26..70f1623f643 100644
--- a/addons/sale/i18n/ar.po
+++ b/addons/sale/i18n/ar.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-14 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1033,7 +1033,8 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
 msgstr ""
 
 #. module: sale
diff --git a/addons/sale/i18n/bg.po b/addons/sale/i18n/bg.po
index 7383c4045e5..a758cf1cc5c 100644
--- a/addons/sale/i18n/bg.po
+++ b/addons/sale/i18n/bg.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-11-27 12:26+0000\n"
+"PO-Revision-Date: 2010-12-14 21:41+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@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:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1035,8 +1035,9 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "Това е товарителния списък който бе генериран за тази фактура"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
@@ -2240,10 +2241,6 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Автоматична декларация"
 
-#~ msgid ""
-#~ "This is the list of picking list that have been generated for this invoice"
-#~ msgstr "Това е товарителния списък който бе генериран за тази фактура"
-
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Доставка - от цеха до клиента"
 
diff --git a/addons/sale/i18n/bs.po b/addons/sale/i18n/bs.po
index a59b06aeebc..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-11-27 13:25+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-14 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1035,8 +1035,9 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "Ovo je spisak izbornih lista koji su generisani za ovu Fakturu"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po
index 7bbb75813ff..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-11-27 13:28+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-14 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1038,8 +1038,10 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
 msgstr ""
+"Aquesta és la llista d'albarans que s'han generat per aquesta factura"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
diff --git a/addons/sale/i18n/cs.po b/addons/sale/i18n/cs.po
index 22564bff325..0672179378d 100644
--- a/addons/sale/i18n/cs.po
+++ b/addons/sale/i18n/cs.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-14 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1033,7 +1033,8 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
 msgstr ""
 
 #. module: sale
diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index 7a46a249cdb..146fdb1842e 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/i18n/de.po
@@ -8,14 +8,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-09 08:12+0000\n"
+"PO-Revision-Date: 2010-12-14 21:47+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <kde-i18n-doc@kde.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:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1101,8 +1101,9 @@ msgstr "Auftragsdatum"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "Diese Lieferaufträge wurden für diese Rechnung erstellt"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
@@ -2664,10 +2665,6 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid " Type of ul: "
 #~ msgstr " Typ der VE: "
 
-#~ msgid ""
-#~ "This is the list of picking list that have been generated for this invoice"
-#~ msgstr "Diese Lieferaufträge wurden für diese Rechnung erstellt"
-
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr ""
diff --git a/addons/sale/i18n/el.po b/addons/sale/i18n/el.po
index 6db8d69639a..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-04 09:22+0000\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-14 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1047,8 +1047,11 @@ msgstr "Ημερομηνία παραγγελίας"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
 msgstr ""
+"Αυτή είναι η λίστα της λίστας συλλογής που έχει δημιουργηθεί για αυτό το "
+"τιμολόγιο"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index 4473a17629b..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-09 09:38+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-14 05:17+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
@@ -1091,8 +1090,9 @@ msgstr "Fecha pedido"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "Ésta es la lista de albaranes que se han generado para esta factura"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
@@ -2162,10 +2162,6 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Declaración automática"
 
-#~ msgid ""
-#~ "This is the list of picking list that have been generated for this invoice"
-#~ msgstr "Ésta es la lista de albaranes que se han generado para esta factura"
-
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Entrega, desde el almacén hasta el cliente."
 
diff --git a/addons/sale/i18n/es_AR.po b/addons/sale/i18n/es_AR.po
index 724ba821c8f..b9d0b2d281b 100644
--- a/addons/sale/i18n/es_AR.po
+++ b/addons/sale/i18n/es_AR.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-14 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1036,8 +1036,9 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "Ésta es la lista de empaque que se ha generado para esta factura"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
diff --git a/addons/sale/i18n/es_EC.po b/addons/sale/i18n/es_EC.po
index 1dff68d8543..f122c370f59 100644
--- a/addons/sale/i18n/es_EC.po
+++ b/addons/sale/i18n/es_EC.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-14 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1075,8 +1075,11 @@ msgstr "Fecha de pedido"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
 msgstr ""
+"Ésta es la lista de paquete de productos que se han generado para esta "
+"factura"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
diff --git a/addons/sale/i18n/et.po b/addons/sale/i18n/et.po
index 60378acaa39..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-11-27 13:08+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-14 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1062,8 +1062,9 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "See on nimekiri noppelehtedest, mis on genereeritud sellele arvele."
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
diff --git a/addons/sale/i18n/fi.po b/addons/sale/i18n/fi.po
index 998f91dd8b9..52a2d14a4e6 100644
--- a/addons/sale/i18n/fi.po
+++ b/addons/sale/i18n/fi.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-11-27 12:29+0000\n"
+"PO-Revision-Date: 2010-12-14 21:29+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Finnish <fi@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:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1036,8 +1036,9 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "Tämä on keräilylista joka on luotu laskulle"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
@@ -2042,10 +2043,6 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "Laskun luominen onnistui!"
 
-#~ msgid ""
-#~ "This is the list of picking list that have been generated for this invoice"
-#~ msgstr "Tämä on keräilylista joka on luotu laskulle"
-
 #~ msgid "Automatic Declaration"
 #~ msgstr "Automaattinen ilmoitus"
 
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index 3338366eaa2..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-09 05:55+0000\n"
-"Last-Translator: Numérigraphe <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-14 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1081,8 +1081,9 @@ msgstr "Date de commande"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "C'est la liste des expéditions générées pour cette commande"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index 14314f97bc5..b1c2473dc6b 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.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-11-27 12:23+0000\n"
+"PO-Revision-Date: 2010-12-14 21:43+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Vinteh\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:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
@@ -1036,8 +1036,9 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "Ovo je ispis liste odabira robe koja je generirana ovim računom"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
@@ -2042,10 +2043,6 @@ msgstr "Račun na temelju dostava"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Automatska Deklaracija"
 
-#~ msgid ""
-#~ "This is the list of picking list that have been generated for this invoice"
-#~ msgstr "Ovo je ispis liste odabira robe koja je generirana ovim računom"
-
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Isporuka, sa skladišta kupcu."
 
diff --git a/addons/sale/i18n/hu.po b/addons/sale/i18n/hu.po
index 9282611b97b..f1abc25afb0 100644
--- a/addons/sale/i18n/hu.po
+++ b/addons/sale/i18n/hu.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-14 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1036,8 +1036,9 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "Ez a kivétek listája, ami ehhez a számlához lett létrehozva"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
@@ -2035,7 +2036,3 @@ msgstr "Számla a szállítások alapján"
 
 #~ msgid "In progress"
 #~ msgstr "Folyamatban"
-
-#~ msgid ""
-#~ "This is the list of picking list that have been generated for this invoice"
-#~ msgstr "Ez a kivétek listája, ami ehhez a számlához lett létrehozva"
diff --git a/addons/sale/i18n/id.po b/addons/sale/i18n/id.po
index 74bad295d8d..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-10-30 12:57+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-14 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1036,8 +1036,9 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "Ini adalah daftar pengepakan yang telah dibuat untuk invoice ini"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index 016408981f2..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-11-29 07:38+0000\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-14 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1056,8 +1056,9 @@ msgstr "Data dell'ordine"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "Questa è la lista di DDT generati per questa Fattura"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
diff --git a/addons/sale/i18n/ko.po b/addons/sale/i18n/ko.po
index 046bace16a9..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-11-27 13:01+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-14 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1034,8 +1034,9 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "이 인보이스를 위해 생성된 피킹 리스트"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
diff --git a/addons/sale/i18n/lt.po b/addons/sale/i18n/lt.po
index 39b580a1790..6a4a76937e5 100644
--- a/addons/sale/i18n/lt.po
+++ b/addons/sale/i18n/lt.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-11-28 19:22+0000\n"
+"PO-Revision-Date: 2010-12-14 21:49+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-14 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1036,8 +1036,9 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "Tai yra sąrašas važtaraščių, sugeneruotų šiai sąskaitai faktūrai."
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
@@ -2065,10 +2066,6 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "Jūsų sąskaita faktūra buvo sukurta!"
 
-#~ msgid ""
-#~ "This is the list of picking list that have been generated for this invoice"
-#~ msgstr "Tai yra sąrašas važtaraščių, sugeneruotų šiai sąskaitai faktūrai."
-
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Pristatymas, iš sandėlio iki kliento."
 
diff --git a/addons/sale/i18n/lv.po b/addons/sale/i18n/lv.po
index cbc3451ee24..050fc3b5fae 100644
--- a/addons/sale/i18n/lv.po
+++ b/addons/sale/i18n/lv.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-14 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1034,7 +1034,8 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
 msgstr ""
 
 #. module: sale
diff --git a/addons/sale/i18n/mn.po b/addons/sale/i18n/mn.po
index d227a60c5fd..e8ebdeb8215 100644
--- a/addons/sale/i18n/mn.po
+++ b/addons/sale/i18n/mn.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-02 07:34+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-14 21:28+0000\n"
+"Last-Translator: Christophe (OpenERP) <Unknown>\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-12-14 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1078,8 +1078,11 @@ msgstr "Захиалах огноо"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
 msgstr ""
+"Энэ дэлгэц нь сонгосон нэхэмжлэлийн эх баримт бүхий агуулахын баримтын "
+"жагсаалт юм"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
@@ -2180,12 +2183,6 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 #~ msgid "Rules are not supported for osv_memory objects !"
 #~ msgstr "osv_memory объект дээр дүрэм хэрэглэх боломжгүй !"
 
-#~ msgid ""
-#~ "This is the list of picking list that have been generated for this invoice"
-#~ msgstr ""
-#~ "Энэ дэлгэц нь сонгосон нэхэмжлэлийн эх баримт бүхий агуулахын баримтын "
-#~ "жагсаалт юм"
-
 #~ msgid ""
 #~ "A sale order generates an invoice, as soon as it is confirmed by the "
 #~ "salesman. Depending on the Invoicing control of the sale order, the invoice "
diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po
index 271651913ab..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-11-27 13:19+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-14 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1035,8 +1035,9 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "Dit is de paklijst die is gegenereerd voor deze factuur"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index dec6fe11b53..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-11 13:52+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-14 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1074,8 +1074,9 @@ msgstr "Data zamówienia"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "To pobranie zostało utworzone dla tej faktury"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
diff --git a/addons/sale/i18n/pt.po b/addons/sale/i18n/pt.po
index 4fd3ed9f3e7..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-12 18:21+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\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-14 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -102,7 +102,7 @@ msgstr "Linha de Ordem de Venda"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Cannot delete a sale order line which is %s !"
-msgstr ""
+msgstr "Não é possível apagar uma linha de ordem de venda que seja %s!"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -211,7 +211,7 @@ msgstr ""
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
 msgid "From a sale order"
-msgstr ""
+msgstr "A partir de uma ordem de venda"
 
 #. module: sale
 #: view:sale.order:0
@@ -228,7 +228,7 @@ msgstr "Desconto (%)"
 #: model:ir.actions.act_window,name:sale.open_board_sales_manager
 #: model:ir.ui.menu,name:sale.menu_board_sales_manager
 msgid "Sales Manager Dashboard"
-msgstr ""
+msgstr "Painel de gestão de vendas"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -283,12 +283,12 @@ msgstr "Agosto"
 #. module: sale
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Está a tentar associar a um lote, que não é do mesmo artigo."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree5
 msgid "All Quotations"
-msgstr "Todas as Cotações"
+msgstr "Todas as cotações"
 
 #. module: sale
 #: report:sale.order:0
@@ -316,7 +316,7 @@ msgstr "Outubro"
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "Cotações"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:0
@@ -354,7 +354,7 @@ msgstr ""
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation Date"
-msgstr ""
+msgstr "Data da cotação"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_open_invoice
@@ -430,7 +430,7 @@ msgstr "Notas"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The quotation '%s' has been converted to a sale order."
-msgstr ""
+msgstr "A cotação '%s' foi convertida em ordem de venda"
 
 #. module: sale
 #: field:product.product,pricelist_purchase:0
@@ -450,7 +450,7 @@ msgstr "Erro: Código ean inválido"
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sale order"
-msgstr ""
+msgstr "Endereço de faturação para a ordem de venda corrente"
 
 #. module: sale
 #: field:sale.order,amount_untaxed:0
@@ -465,7 +465,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sale order"
-msgstr ""
+msgstr "A conta analítica relacionada com uma ordem de venda"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_deliveryorder0
@@ -516,7 +516,7 @@ msgstr "Endereço da Factura"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Search Uninvoiced Lines"
-msgstr ""
+msgstr "Procurar linhas não faturadas"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleprocurement0
@@ -635,7 +635,7 @@ msgstr "Indica que uma fatura foi paga"
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
-msgstr ""
+msgstr "Data da ordem"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -720,7 +720,7 @@ msgstr "Endereço para Envio"
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros avançados"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -784,6 +784,7 @@ msgstr "Sua Referência"
 msgid ""
 "The name and address of the contact who requested the order or quotation."
 msgstr ""
+"O nome e a morada do contacto que fez uma encomenda ou pediu uma cotação"
 
 #. module: sale
 #: help:res.company,security_lead:0
@@ -841,7 +842,7 @@ msgstr "Criar Factura"
 #. module: sale
 #: field:sale.installer,sale_margin:0
 msgid "Margins in Sales Orders"
-msgstr ""
+msgstr "Fusão de ordens de vendas"
 
 #. module: sale
 #: view:sale.order:0
@@ -961,7 +962,7 @@ msgstr ""
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The sale order '%s' has been cancelled."
-msgstr ""
+msgstr "A ordem de venda '%s' foi cancelada."
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
@@ -981,7 +982,7 @@ msgstr "Entrega Parcial"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_confirmquotation0
 msgid "Confirm Quotation"
-msgstr "Confirmar Cotação"
+msgstr "Confirmar cotação"
 
 #. module: sale
 #: view:sale.order:0
@@ -1035,8 +1036,9 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "Esta é a lista de recolha gerada para esta factura"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
@@ -1134,7 +1136,7 @@ msgstr ""
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_sales_product_total_price
 msgid "Sales by Product's Category"
-msgstr ""
+msgstr "Venda por categoria de produto"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -1240,7 +1242,7 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
 msgid "Old Quotations"
-msgstr ""
+msgstr "Cotações antigas"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1332,7 +1334,7 @@ msgstr "Factura"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Could not cancel sale order line!"
-msgstr ""
+msgstr "Não foi possível cancelar a linha da ordem de venda!"
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
@@ -1381,7 +1383,7 @@ msgstr "Faturação"
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sale order is confirmed"
-msgstr ""
+msgstr "Data na qual a ordem de venda foi confirmada"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
@@ -1443,7 +1445,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Shipping address for current sale order"
-msgstr ""
+msgstr "Endereço de entrega para a ordem de venda corrente"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -1845,7 +1847,7 @@ msgstr ""
 #. module: sale
 #: view:sale.open.invoice:0
 msgid "You invoice has been successfully created!"
-msgstr ""
+msgstr "A sua fatura foi criada com êxito!"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1909,7 +1911,7 @@ msgstr ""
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Not enough stock !"
-msgstr ""
+msgstr "Stock insuficiente!"
 
 #. module: sale
 #: constraint:stock.move:0
@@ -1979,13 +1981,13 @@ msgstr "Abril"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The sale order '%s' has been set in draft state."
-msgstr ""
+msgstr "A ordem de venda '%s' foi colocada como 'rascunho'"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Search Sales Order"
-msgstr ""
+msgstr "Procurar ordens de venda"
 
 #. module: sale
 #: field:sale.order,payment_term:0
@@ -2096,10 +2098,6 @@ msgstr "Factura Baseada em Entregas"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de modelo inválido na definição da acção"
 
-#~ msgid ""
-#~ "This is the list of picking list that have been generated for this invoice"
-#~ msgstr "Esta é a lista de recolha gerada para esta factura"
-
 #~ msgid "Customer Ref"
 #~ msgstr "Ref do Cliente"
 
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index bec6f085910..7efceca0b90 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-11-28 13:04+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-14 21:34+0000\n"
+"Last-Translator: Christophe (OpenERP) <Unknown>\n"
 "Language-Team: <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:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1085,8 +1085,9 @@ msgstr "Data da Ordem"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "Esta é a lista de separação que foi gerada para esta fatura"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
@@ -2145,10 +2146,6 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Invoice Corrected"
 #~ msgstr "Fatura Corrigida"
 
-#~ msgid ""
-#~ "This is the list of picking list that have been generated for this invoice"
-#~ msgstr "Esta é a lista de separação que foi gerada para esta fatura"
-
 #~ msgid "Invoice after delivery"
 #~ msgstr "Faturar depois de entreguar"
 
diff --git a/addons/sale/i18n/ro.po b/addons/sale/i18n/ro.po
index 03169d8e9c7..8bc17a1b62d 100644
--- a/addons/sale/i18n/ro.po
+++ b/addons/sale/i18n/ro.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-11-27 14:37+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-14 21:09+0000\n"
+"Last-Translator: Christophe (OpenERP) <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:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1033,8 +1033,10 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
 msgstr ""
+"Aceasta este lista cu articole de ridicat generată pentru această factură"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
@@ -2043,11 +2045,6 @@ msgstr ""
 #~ msgid "Sales order"
 #~ msgstr "Comenzi"
 
-#~ msgid ""
-#~ "This is the list of picking list that have been generated for this invoice"
-#~ msgstr ""
-#~ "Aceasta este lista cu articole de ridicat generată pentru această factură"
-
 #~ msgid "Reference"
 #~ msgstr "Referinta"
 
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 09e65b63659..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-09 10:03+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-14 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1072,8 +1072,9 @@ msgstr "Дата заказа"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "Это список отборочных листов, созданных для этого счета"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index b6365a4317e..e2c016966d8 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/sk.po b/addons/sale/i18n/sk.po
index 2c99ed9133a..84ba780c6a2 100644
--- a/addons/sale/i18n/sk.po
+++ b/addons/sale/i18n/sk.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-14 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1034,7 +1034,8 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
 msgstr ""
 
 #. module: sale
diff --git a/addons/sale/i18n/sl.po b/addons/sale/i18n/sl.po
index 65463e775b8..e5798fc46f6 100644
--- a/addons/sale/i18n/sl.po
+++ b/addons/sale/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:16+0000\n"
-"PO-Revision-Date: 2010-08-03 06:39+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-14 21:38+0000\n"
+"Last-Translator: Christophe (OpenERP) <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:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1033,8 +1033,9 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "To je seznam prevzemnih listov, ki so bili narejeni za ta račun"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
@@ -2044,10 +2045,6 @@ msgstr ""
 #~ msgid "Automatic Declaration"
 #~ msgstr "Samodejna napoved"
 
-#~ msgid ""
-#~ "This is the list of picking list that have been generated for this invoice"
-#~ msgstr "To je seznam prevzemnih listov, ki so bili narejeni za ta račun"
-
 #~ msgid "Origin"
 #~ msgstr "Izvor"
 
diff --git a/addons/sale/i18n/sq.po b/addons/sale/i18n/sq.po
index bd53e03c0f4..42008bac368 100644
--- a/addons/sale/i18n/sq.po
+++ b/addons/sale/i18n/sq.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-14 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1034,7 +1034,8 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
 msgstr ""
 
 #. module: sale
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index 1213c0d6863..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-11-27 13:18+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-14 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1073,8 +1073,9 @@ msgstr "Naruceno Dana"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "Ovo je spisak izbornih lista koji su generisani za ovaj račun"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index 829dd5016a4..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-13 21:01+0000\n"
-"Last-Translator: Anders Eriksson, Aspirix AB <ae@mobilasystem.se>\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-14 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1045,8 +1045,9 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "Detta är plocklistan som genererats för denna faktura"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
diff --git a/addons/sale/i18n/tlh.po b/addons/sale/i18n/tlh.po
index 6973a39a864..e4c1c8df23c 100644
--- a/addons/sale/i18n/tlh.po
+++ b/addons/sale/i18n/tlh.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-14 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1033,7 +1033,8 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
 msgstr ""
 
 #. module: sale
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 5c54a7860bf..8264344ca72 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.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-14 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1035,7 +1035,8 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
 msgstr ""
 
 #. module: sale
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index 6df023b7016..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-09-09 07:18+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-14 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1033,8 +1033,9 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "Список відбірних листів, згенерованих для цього інвойса"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index c5d0c3679ca..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-12 13:53+0000\n"
-"Last-Translator: Phong Nguyen <Unknown>\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-14 05:17+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,12 +1049,13 @@ 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
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "Đây là danh sách các sản phẩm đã chọn được tạo ra cho hóa đơn này"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
@@ -1394,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 5a947e8d6b8..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-09 08:58+0000\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-14 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -26,13 +26,13 @@ msgstr ""
 msgid ""
 "If you don't have enough stock available to deliver all at once, do you "
 "accept partial shipments or not?"
-msgstr "如果你没足够的库存可以一次提供,可以接受部分货物不?"
+msgstr "如果库存不够一次全部交货，你是否接受部分交货？"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "天"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
@@ -43,7 +43,7 @@ msgstr "取消订单"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Payment Before Delivery"
-msgstr "运送前付款"
+msgstr "款到发货"
 
 #. module: sale
 #: help:sale.order,origin:0
@@ -54,7 +54,7 @@ msgstr ""
 #: code:addons/sale/wizard/sale_make_invoice.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "警告 !"
 
 #. module: sale
 #: report:sale.order:0
@@ -83,18 +83,18 @@ msgstr "辅助核算项目"
 #. module: sale
 #: model:process.node,name:sale.process_node_saleprocurement0
 msgid "Procurement Order"
-msgstr ""
+msgstr "采购订单"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "合作伙伴"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Order Line"
-msgstr "订单明细"
+msgstr "采购订单明细"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -116,7 +116,7 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,price_average:0
 msgid "Average Price"
-msgstr "平均价"
+msgstr "平均价格"
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
@@ -134,7 +134,7 @@ msgstr ""
 #: field:sale.order.line,state:0
 #: view:sale.report:0
 msgid "State"
-msgstr ""
+msgstr "州"
 
 #. module: sale
 #: report:sale.order:0
@@ -1033,8 +1033,9 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr "这领料/提货单已产生在此发票上."
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
@@ -1181,12 +1182,12 @@ msgstr "运送异常"
 #. module: sale
 #: field:sale.make.invoice,grouped:0
 msgid "Group the invoices"
-msgstr "集中发票成组"
+msgstr "发票组"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Shipping & Manual Invoice"
-msgstr "交货及手动开发票"
+msgstr "发货和手工发票"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -1541,7 +1542,7 @@ msgstr ""
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "You must first cancel all invoices attached to this sale order."
-msgstr ""
+msgstr "您必须先取消所有和这个订单相关的发票。"
 
 #. module: sale
 #: report:sale.order:0
@@ -2156,10 +2157,6 @@ msgstr "发票基于送货单"
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "你的发票已经成功创建!"
 
-#~ msgid ""
-#~ "This is the list of picking list that have been generated for this invoice"
-#~ msgstr "这领料/提货单已产生在此发票上."
-
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "送货,从仓库到客户"
 
diff --git a/addons/sale/i18n/zh_TW.po b/addons/sale/i18n/zh_TW.po
index 831de0707c3..e35ea281f6c 100644
--- a/addons/sale/i18n/zh_TW.po
+++ b/addons/sale/i18n/zh_TW.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-14 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1033,7 +1033,8 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
 msgstr ""
 
 #. module: sale
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 5f5e84f4ac0..91492532acc 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -215,10 +215,10 @@
           <para style="terp_tblheader_General_Centre">[[ o.state &lt;&gt; 'draft' and removeParentNode('para') ]] Quotation Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Our Salesman </para>
+          <para style="terp_tblheader_General_Centre">Salesman</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Payment Terms</para>
+          <para style="terp_tblheader_General_Centre">Payment Term</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 42627750697..9ba16400bb0 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -50,8 +50,6 @@ class sale_order(osv.osv):
     _description = "Sales 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
@@ -273,7 +257,7 @@ class sale_order(osv.osv):
             },
             multi='sums', help="The total amount."),
 
-        'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sales order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.", required=True),
+        'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.", required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
         'company_id': fields.related('shop_id','company_id',type='many2one',relation='res.company',string='Company',store=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 sales 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
@@ -779,8 +751,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':
@@ -840,7 +810,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)
@@ -849,8 +820,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:
@@ -984,8 +953,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 sales order line that has already been invoiced !'))
@@ -997,13 +964,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):
@@ -1031,8 +994,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': []})
@@ -1229,8 +1190,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/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 88f15e00ec0..69e30517e76 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_sale_shop","sale.shop","model_sale_shop","base.group_user",1,1,0,0
+"access_sale_shop","sale.shop","model_sale_shop","base.group_user",1,0,0,0
 "access_sale_order","sale.order","model_sale_order","base.group_sale_salesman",1,1,1,0
 "access_sale_order_line","sale.order.line","model_sale_order_line","base.group_sale_salesman",1,1,1,1
 "access_account_invoice_tax_salesman","account_invoice_tax salesman","account.model_account_invoice_tax","base.group_sale_salesman",1,1,1,0
@@ -33,7 +33,7 @@
 "access_account_fiscalyear_manager","account.fiscalyear.manager","account.model_account_fiscalyear","base.group_sale_manager",1,0,0,0
 "access_account_fiscalyear_user","account.fiscalyear.user","account.model_account_fiscalyear","base.group_sale_salesman",1,0,0,0
 "access_res_partner_address_user","res.partner.address.user","base.model_res_partner_address","base.group_sale_salesman",1,0,0,0
-"access_account_tax_user","account.tax.user","account.model_account_tax","base.group_sale_salesman",1,1,1,0
+"access_account_tax_user","account.tax.user","account.model_account_tax","base.group_sale_salesman",1,0,0,0
 "access_product_packaging_user","product.packaging.user","product.model_product_packaging","base.group_sale_salesman",1,1,1,0
 "access_ir_attachment_sales","ir.attachment.sales","base.model_ir_attachment","base.group_sale_salesman",1,1,1,0
 "access_ir_attachment_manager","ir.attachment.manager","base.model_ir_attachment","base.group_sale_manager",1,1,1,1
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index dd0aa3ad855..fea84e019c4 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 05f17b58e3b..de845b5b34d 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -25,8 +25,8 @@ import netsvc
 
 class sale_order_line_make_invoice(osv.osv_memory):
     _name = "sale.order.line.make.invoice"
-    _description = "Sales OrderLine Make_invoice"
-    def make_invoices(self, cr, uid, ids, context):
+    _description = "Sale OrderLine Make_invoice"
+    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 7ca635f5484..55047d011e5 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 sales 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 94d5ab38953..4b1e4511021 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/ar.po b/addons/sale_analytic_plans/i18n/ar.po
index ca4b0887591..bf0ea766a7c 100644
--- a/addons/sale_analytic_plans/i18n/ar.po
+++ b/addons/sale_analytic_plans/i18n/ar.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/bg.po b/addons/sale_analytic_plans/i18n/bg.po
index 589c595dfc6..4a5d2b1a907 100644
--- a/addons/sale_analytic_plans/i18n/bg.po
+++ b/addons/sale_analytic_plans/i18n/bg.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/bs.po b/addons/sale_analytic_plans/i18n/bs.po
index c0b8cdf60c7..1807fd78b89 100644
--- a/addons/sale_analytic_plans/i18n/bs.po
+++ b/addons/sale_analytic_plans/i18n/bs.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/ca.po b/addons/sale_analytic_plans/i18n/ca.po
index 817b5fd8d57..637d92258c2 100644
--- a/addons/sale_analytic_plans/i18n/ca.po
+++ b/addons/sale_analytic_plans/i18n/ca.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/cs.po b/addons/sale_analytic_plans/i18n/cs.po
index 2ef67f0f443..b239382251f 100644
--- a/addons/sale_analytic_plans/i18n/cs.po
+++ b/addons/sale_analytic_plans/i18n/cs.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/da.po b/addons/sale_analytic_plans/i18n/da.po
index 621843c9314..47b7b45a038 100644
--- a/addons/sale_analytic_plans/i18n/da.po
+++ b/addons/sale_analytic_plans/i18n/da.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/de.po b/addons/sale_analytic_plans/i18n/de.po
index 16c597ff51d..48d421ef29c 100644
--- a/addons/sale_analytic_plans/i18n/de.po
+++ b/addons/sale_analytic_plans/i18n/de.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/el.po b/addons/sale_analytic_plans/i18n/el.po
index 3e9c2cca2e7..d19879368c5 100644
--- a/addons/sale_analytic_plans/i18n/el.po
+++ b/addons/sale_analytic_plans/i18n/el.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/sale_analytic_plans/i18n/es.po b/addons/sale_analytic_plans/i18n/es.po
index 2cbe448927d..4da1138c744 100644
--- a/addons/sale_analytic_plans/i18n/es.po
+++ b/addons/sale_analytic_plans/i18n/es.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/es_AR.po b/addons/sale_analytic_plans/i18n/es_AR.po
index c6d9000c2d7..15b6f752712 100644
--- a/addons/sale_analytic_plans/i18n/es_AR.po
+++ b/addons/sale_analytic_plans/i18n/es_AR.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/et.po b/addons/sale_analytic_plans/i18n/et.po
index ead7db0e2f8..b1e5a0082ac 100644
--- a/addons/sale_analytic_plans/i18n/et.po
+++ b/addons/sale_analytic_plans/i18n/et.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/fr.po b/addons/sale_analytic_plans/i18n/fr.po
index ff6617f7ce3..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-14 05:27+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/gl.po b/addons/sale_analytic_plans/i18n/gl.po
index c9336cbae6d..12a108edc35 100644
--- a/addons/sale_analytic_plans/i18n/gl.po
+++ b/addons/sale_analytic_plans/i18n/gl.po
@@ -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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/hr.po b/addons/sale_analytic_plans/i18n/hr.po
index c36b6df4f8d..ffce72364df 100644
--- a/addons/sale_analytic_plans/i18n/hr.po
+++ b/addons/sale_analytic_plans/i18n/hr.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/sale_analytic_plans/i18n/hu.po b/addons/sale_analytic_plans/i18n/hu.po
index ca4b0887591..bf0ea766a7c 100644
--- a/addons/sale_analytic_plans/i18n/hu.po
+++ b/addons/sale_analytic_plans/i18n/hu.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/id.po b/addons/sale_analytic_plans/i18n/id.po
index af41e77fbc2..f749400827e 100644
--- a/addons/sale_analytic_plans/i18n/id.po
+++ b/addons/sale_analytic_plans/i18n/id.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/it.po b/addons/sale_analytic_plans/i18n/it.po
index a731ecad975..a45e5d84da8 100644
--- a/addons/sale_analytic_plans/i18n/it.po
+++ b/addons/sale_analytic_plans/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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/ko.po b/addons/sale_analytic_plans/i18n/ko.po
index 374713f4ea9..a83472725f4 100644
--- a/addons/sale_analytic_plans/i18n/ko.po
+++ b/addons/sale_analytic_plans/i18n/ko.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/lt.po b/addons/sale_analytic_plans/i18n/lt.po
index ca4b0887591..bf0ea766a7c 100644
--- a/addons/sale_analytic_plans/i18n/lt.po
+++ b/addons/sale_analytic_plans/i18n/lt.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/mn.po b/addons/sale_analytic_plans/i18n/mn.po
index c9e4c1ab902..d11252b029e 100644
--- a/addons/sale_analytic_plans/i18n/mn.po
+++ b/addons/sale_analytic_plans/i18n/mn.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/nl.po b/addons/sale_analytic_plans/i18n/nl.po
index 1cf2ad8ff96..713fe2383d8 100644
--- a/addons/sale_analytic_plans/i18n/nl.po
+++ b/addons/sale_analytic_plans/i18n/nl.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/nl_BE.po b/addons/sale_analytic_plans/i18n/nl_BE.po
index e287f3a3f21..7ae355cbd82 100644
--- a/addons/sale_analytic_plans/i18n/nl_BE.po
+++ b/addons/sale_analytic_plans/i18n/nl_BE.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/pl.po b/addons/sale_analytic_plans/i18n/pl.po
index 8abde06d950..a7f2d0fa151 100644
--- a/addons/sale_analytic_plans/i18n/pl.po
+++ b/addons/sale_analytic_plans/i18n/pl.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/pt.po b/addons/sale_analytic_plans/i18n/pt.po
index 7b062bd8431..1d2569fb64f 100644
--- a/addons/sale_analytic_plans/i18n/pt.po
+++ b/addons/sale_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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/pt_BR.po b/addons/sale_analytic_plans/i18n/pt_BR.po
index a4fd239ccfe..46ee40cbd07 100644
--- a/addons/sale_analytic_plans/i18n/pt_BR.po
+++ b/addons/sale_analytic_plans/i18n/pt_BR.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/ro.po b/addons/sale_analytic_plans/i18n/ro.po
index 8d20653190a..53c7e6d5e05 100644
--- a/addons/sale_analytic_plans/i18n/ro.po
+++ b/addons/sale_analytic_plans/i18n/ro.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/ru.po b/addons/sale_analytic_plans/i18n/ru.po
index 0d92f4c329a..bbb411a6635 100644
--- a/addons/sale_analytic_plans/i18n/ru.po
+++ b/addons/sale_analytic_plans/i18n/ru.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
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/i18n/sk.po b/addons/sale_analytic_plans/i18n/sk.po
index 62a6698bce8..d31342d1d65 100644
--- a/addons/sale_analytic_plans/i18n/sk.po
+++ b/addons/sale_analytic_plans/i18n/sk.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/sl.po b/addons/sale_analytic_plans/i18n/sl.po
index 574284dff7d..107598d8488 100644
--- a/addons/sale_analytic_plans/i18n/sl.po
+++ b/addons/sale_analytic_plans/i18n/sl.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/sq.po b/addons/sale_analytic_plans/i18n/sq.po
index a1903309e1f..0fe47e6071f 100644
--- a/addons/sale_analytic_plans/i18n/sq.po
+++ b/addons/sale_analytic_plans/i18n/sq.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/sr.po b/addons/sale_analytic_plans/i18n/sr.po
index 400a2c01712..1da9c92d765 100644
--- a/addons/sale_analytic_plans/i18n/sr.po
+++ b/addons/sale_analytic_plans/i18n/sr.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/sv.po b/addons/sale_analytic_plans/i18n/sv.po
index f1e6d8df18b..6eadde1610c 100644
--- a/addons/sale_analytic_plans/i18n/sv.po
+++ b/addons/sale_analytic_plans/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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/tlh.po b/addons/sale_analytic_plans/i18n/tlh.po
index c74c142cb88..eb9fe728d5b 100644
--- a/addons/sale_analytic_plans/i18n/tlh.po
+++ b/addons/sale_analytic_plans/i18n/tlh.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/tr.po b/addons/sale_analytic_plans/i18n/tr.po
index 169f22623dd..7fd3c930250 100644
--- a/addons/sale_analytic_plans/i18n/tr.po
+++ b/addons/sale_analytic_plans/i18n/tr.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/uk.po b/addons/sale_analytic_plans/i18n/uk.po
index ec25a557ef3..9f8e193cf1e 100644
--- a/addons/sale_analytic_plans/i18n/uk.po
+++ b/addons/sale_analytic_plans/i18n/uk.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/vi.po b/addons/sale_analytic_plans/i18n/vi.po
index 490dceeb564..c0aa4d044b9 100644
--- a/addons/sale_analytic_plans/i18n/vi.po
+++ b/addons/sale_analytic_plans/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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/zh_CN.po b/addons/sale_analytic_plans/i18n/zh_CN.po
index aa06b955a2c..89336b5e3ca 100644
--- a/addons/sale_analytic_plans/i18n/zh_CN.po
+++ b/addons/sale_analytic_plans/i18n/zh_CN.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/zh_TW.po b/addons/sale_analytic_plans/i18n/zh_TW.po
index 48b38039e7f..6b132307478 100644
--- a/addons/sale_analytic_plans/i18n/zh_TW.po
+++ b/addons/sale_analytic_plans/i18n/zh_TW.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-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
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 83a95663b72..cdb5893a6f3 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 sales 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/ar.po b/addons/sale_journal/i18n/ar.po
index da2ea039b98..db44d43a90f 100644
--- a/addons/sale_journal/i18n/ar.po
+++ b/addons/sale_journal/i18n/ar.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/bg.po b/addons/sale_journal/i18n/bg.po
index 549b39531c1..a273b79b502 100644
--- a/addons/sale_journal/i18n/bg.po
+++ b/addons/sale_journal/i18n/bg.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/bs.po b/addons/sale_journal/i18n/bs.po
index e06816eac3f..303af496741 100644
--- a/addons/sale_journal/i18n/bs.po
+++ b/addons/sale_journal/i18n/bs.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/ca.po b/addons/sale_journal/i18n/ca.po
index 80c01fee35f..851bec05cb7 100644
--- a/addons/sale_journal/i18n/ca.po
+++ b/addons/sale_journal/i18n/ca.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/cs.po b/addons/sale_journal/i18n/cs.po
index da2ea039b98..e4f15361e00 100644
--- a/addons/sale_journal/i18n/cs.po
+++ b/addons/sale_journal/i18n/cs.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/de.po b/addons/sale_journal/i18n/de.po
index 13e13e890fe..016c662fa71 100644
--- a/addons/sale_journal/i18n/de.po
+++ b/addons/sale_journal/i18n/de.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/es.po b/addons/sale_journal/i18n/es.po
index 2ce8256a32e..6d7f94441fb 100644
--- a/addons/sale_journal/i18n/es.po
+++ b/addons/sale_journal/i18n/es.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/es_AR.po b/addons/sale_journal/i18n/es_AR.po
index 43672e47516..f26efbcce89 100644
--- a/addons/sale_journal/i18n/es_AR.po
+++ b/addons/sale_journal/i18n/es_AR.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/et.po b/addons/sale_journal/i18n/et.po
index 619d9c28923..430ff7b3e2a 100644
--- a/addons/sale_journal/i18n/et.po
+++ b/addons/sale_journal/i18n/et.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/fr.po b/addons/sale_journal/i18n/fr.po
index bbea99dfe64..2e36b0ca828 100644
--- a/addons/sale_journal/i18n/fr.po
+++ b/addons/sale_journal/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 08:41+0000\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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
@@ -26,16 +26,17 @@ 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
 msgid "Sale Order"
-msgstr ""
+msgstr "Commande de vente"
 
 #. module: sale_journal
 #: view:res.partner:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Facturation"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
@@ -44,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
@@ -56,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
@@ -87,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
@@ -110,12 +117,12 @@ msgstr "Actif"
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_res_partner
 msgid "Partner"
-msgstr ""
+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/hr.po b/addons/sale_journal/i18n/hr.po
index e29079ff7a7..94a480178e0 100644
--- a/addons/sale_journal/i18n/hr.po
+++ b/addons/sale_journal/i18n/hr.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/sale_journal/i18n/hu.po b/addons/sale_journal/i18n/hu.po
index da2ea039b98..e4f15361e00 100644
--- a/addons/sale_journal/i18n/hu.po
+++ b/addons/sale_journal/i18n/hu.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/id.po b/addons/sale_journal/i18n/id.po
index e0a8ce2cdad..3a83df43055 100644
--- a/addons/sale_journal/i18n/id.po
+++ b/addons/sale_journal/i18n/id.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/it.po b/addons/sale_journal/i18n/it.po
index a24b6512dfa..21e3f9973af 100644
--- a/addons/sale_journal/i18n/it.po
+++ b/addons/sale_journal/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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/ko.po b/addons/sale_journal/i18n/ko.po
index 1859bad2985..9322c7622b1 100644
--- a/addons/sale_journal/i18n/ko.po
+++ b/addons/sale_journal/i18n/ko.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/lt.po b/addons/sale_journal/i18n/lt.po
index da2ea039b98..e4f15361e00 100644
--- a/addons/sale_journal/i18n/lt.po
+++ b/addons/sale_journal/i18n/lt.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/nl.po b/addons/sale_journal/i18n/nl.po
index 009e8f89ba0..7fab1d6d600 100644
--- a/addons/sale_journal/i18n/nl.po
+++ b/addons/sale_journal/i18n/nl.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/nl_BE.po b/addons/sale_journal/i18n/nl_BE.po
index 9784cd3f778..92772a2ffa3 100644
--- a/addons/sale_journal/i18n/nl_BE.po
+++ b/addons/sale_journal/i18n/nl_BE.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/pl.po b/addons/sale_journal/i18n/pl.po
index 7d92b25857f..0fc7099d2be 100644
--- a/addons/sale_journal/i18n/pl.po
+++ b/addons/sale_journal/i18n/pl.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/pt.po b/addons/sale_journal/i18n/pt.po
index 01fe98784d7..2e4a0bc8b12 100644
--- a/addons/sale_journal/i18n/pt.po
+++ b/addons/sale_journal/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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/pt_BR.po b/addons/sale_journal/i18n/pt_BR.po
index 0e5f3d49298..407baa81a67 100644
--- a/addons/sale_journal/i18n/pt_BR.po
+++ b/addons/sale_journal/i18n/pt_BR.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/ro.po b/addons/sale_journal/i18n/ro.po
index c2dd344e111..33a1eb29e52 100644
--- a/addons/sale_journal/i18n/ro.po
+++ b/addons/sale_journal/i18n/ro.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/ru.po b/addons/sale_journal/i18n/ru.po
index c94657159f1..be6babf2e36 100644
--- a/addons/sale_journal/i18n/ru.po
+++ b/addons/sale_journal/i18n/ru.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
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_journal/i18n/sl.po b/addons/sale_journal/i18n/sl.po
index 335e634cf42..a25bb4e65f9 100644
--- a/addons/sale_journal/i18n/sl.po
+++ b/addons/sale_journal/i18n/sl.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/sq.po b/addons/sale_journal/i18n/sq.po
index df38342e7b5..0eeae2ff43a 100644
--- a/addons/sale_journal/i18n/sq.po
+++ b/addons/sale_journal/i18n/sq.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/sv.po b/addons/sale_journal/i18n/sv.po
index 79920d72b4a..f38d236c69e 100644
--- a/addons/sale_journal/i18n/sv.po
+++ b/addons/sale_journal/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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/tlh.po b/addons/sale_journal/i18n/tlh.po
index a9e9505e23c..6e2b5d50b0c 100644
--- a/addons/sale_journal/i18n/tlh.po
+++ b/addons/sale_journal/i18n/tlh.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/tr.po b/addons/sale_journal/i18n/tr.po
index 0c18f54b63d..a495751269b 100644
--- a/addons/sale_journal/i18n/tr.po
+++ b/addons/sale_journal/i18n/tr.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/uk.po b/addons/sale_journal/i18n/uk.po
index a272cd33154..2f4b1d5e260 100644
--- a/addons/sale_journal/i18n/uk.po
+++ b/addons/sale_journal/i18n/uk.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/vi.po b/addons/sale_journal/i18n/vi.po
index e6b363af681..5025ec29e69 100644
--- a/addons/sale_journal/i18n/vi.po
+++ b/addons/sale_journal/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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/zh_CN.po b/addons/sale_journal/i18n/zh_CN.po
index 13edd27da2a..d4551e6e2cb 100644
--- a/addons/sale_journal/i18n/zh_CN.po
+++ b/addons/sale_journal/i18n/zh_CN.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/zh_TW.po b/addons/sale_journal/i18n/zh_TW.po
index 81ae4c96477..17bfe6947d9 100644
--- a/addons/sale_journal/i18n/zh_TW.po
+++ b/addons/sale_journal/i18n/zh_TW.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-14 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
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 7dce5379d9b..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-07-29 08:56+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-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
@@ -40,7 +40,7 @@ msgstr "Remarque"
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Prix unitaire"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
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 89344a930eb..853783c218d 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/ca.po b/addons/sale_margin/i18n/ca.po
index fb3d5dd899e..bedd2b7cda4 100644
--- a/addons/sale_margin/i18n/ca.po
+++ b/addons/sale_margin/i18n/ca.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:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-06-21 15:57+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_margin
@@ -27,19 +27,6 @@ msgstr ""
 msgid "Customer Refund"
 msgstr "Factura d'abonament de client"
 
-#. module: sale_margin
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-"especial!"
-
-#. module: sale_margin
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de model no vàlid en la definició de l'acció."
-
 #. module: sale_margin
 #: selection:report.account.invoice.product,type:0
 msgid "Customer Invoice"
@@ -82,11 +69,6 @@ msgstr "Esborrany"
 msgid "Paid"
 msgstr "Pagat"
 
-#. module: sale_margin
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_stock_picking
 msgid "Picking List"
@@ -245,11 +227,6 @@ msgstr "Quantitat"
 msgid "Supplier Refund"
 msgstr "Factura d'abonament de proveïdor"
 
-#. module: sale_margin
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "March"
@@ -308,6 +285,14 @@ msgstr "Mes"
 msgid "Canceled"
 msgstr "Cancel·lada"
 
+#. module: sale_margin
+#: model:ir.actions.act_window,help:sale_margin.action_report_account_invoice_report
+msgid ""
+"This report gives you an overview of all the invoices generated by the "
+"system. You can sort and group your results by specific selection criteria "
+"to quickly find what you are looking for."
+msgstr ""
+
 #. module: sale_margin
 #: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
 msgid "Invoice Report"
@@ -353,9 +338,18 @@ msgstr ""
 #~ msgid "report.account.invoice.product"
 #~ msgstr "informe.comptabilitat.factura.producte"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+#~ "especial!"
+
 #~ msgid "Create invoices"
 #~ msgstr "Crea factures"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invàlid per a la definició de la vista!"
+
 #~ msgid "All Months"
 #~ msgstr "Tots els mesos"
 
@@ -365,6 +359,9 @@ msgstr ""
 #~ msgid "report.account.invoice.partner.product.tree"
 #~ msgstr "informe.comptabilitat.factura.empresa.producte.arbre"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom de model no vàlid en la definició de l'acció."
+
 #~ msgid "Supplier Invoices"
 #~ msgstr "Factures de proveïdor"
 
diff --git a/addons/sale_margin/i18n/de.po b/addons/sale_margin/i18n/de.po
index 501e32b8e42..a2d1541027e 100644
--- a/addons/sale_margin/i18n/de.po
+++ b/addons/sale_margin/i18n/de.po
@@ -8,7 +8,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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-12-01 09:32+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -16,7 +16,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-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_margin
@@ -29,29 +29,11 @@ msgstr "Kategorie"
 msgid "Customer Refund"
 msgstr "Kundengutschrift"
 
-#. module: sale_margin
-#: 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: sale_margin
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: sale_margin
 #: selection:report.account.invoice.product,type:0
 msgid "Customer Invoice"
 msgstr "Ausgangsrechnung"
 
-#. module: sale_margin
-#: 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 !"
-
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "February"
@@ -89,11 +71,6 @@ msgstr "Entwurf"
 msgid "Paid"
 msgstr "Bezahlt"
 
-#. module: sale_margin
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
-
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_stock_picking
 msgid "Picking List"
@@ -162,9 +139,9 @@ msgid "Search Margin"
 msgstr "Suche Spannen"
 
 #. module: sale_margin
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+#: view:report.account.invoice.product:0
+msgid "This Year"
+msgstr "Dieses Jahr"
 
 #. module: sale_margin
 #: field:report.account.invoice.product,date:0
@@ -217,11 +194,6 @@ msgstr "Produktkosten"
 msgid "October"
 msgstr "Oktober"
 
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-msgid "This Year"
-msgstr "Dieses Jahr"
-
 #. module: sale_margin
 #: view:report.account.invoice.product:0
 #: field:report.account.invoice.product,year:0
@@ -258,11 +230,6 @@ msgstr "Betrag"
 msgid "Supplier Refund"
 msgstr "Lieferantengutschrift"
 
-#. module: sale_margin
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter XML-Code für diese Ansicht!"
-
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "March"
@@ -368,10 +335,8 @@ msgstr "Offen"
 msgid "Invoice Analysis"
 msgstr "Statistik Rechnungen"
 
-#. module: sale_margin
-#: 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 "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter XML-Code für diese Ansicht!"
 
 #~ msgid "report.account.invoice.partner.product"
 #~ msgstr "report.account.invoice.partner.product"
@@ -379,6 +344,12 @@ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
 #~ msgid "report.account.invoice.product"
 #~ msgstr "report.account.invoice.product"
 
+#~ 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 "Invoices by Product"
 #~ msgstr "Rechnugnen je Produkt"
 
@@ -450,3 +421,18 @@ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
 
 #~ msgid "report.account.invoice"
 #~ msgstr "report.account.invoice"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ 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 !"
diff --git a/addons/sale_margin/i18n/es.po b/addons/sale_margin/i18n/es.po
index 91f932cbc90..f2471e5efa0 100644
--- a/addons/sale_margin/i18n/es.po
+++ b/addons/sale_margin/i18n/es.po
@@ -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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_margin
diff --git a/addons/sale_margin/i18n/et.po b/addons/sale_margin/i18n/et.po
index 9c626cec6bb..c5730664672 100644
--- a/addons/sale_margin/i18n/et.po
+++ b/addons/sale_margin/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:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-06-25 18:17+0000\n"
 "Last-Translator: lyyser <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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_margin
@@ -27,18 +27,6 @@ msgstr ""
 msgid "Customer Refund"
 msgstr "Kliendi tagasimakse"
 
-#. module: sale_margin
-#: 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: sale_margin
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
 #. module: sale_margin
 #: selection:report.account.invoice.product,type:0
 msgid "Customer Invoice"
@@ -81,11 +69,6 @@ msgstr "Mustand"
 msgid "Paid"
 msgstr "Makstud"
 
-#. module: sale_margin
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_stock_picking
 msgid "Picking List"
@@ -244,11 +227,6 @@ msgstr "Hulk"
 msgid "Supplier Refund"
 msgstr "Tarnija tagasimakse"
 
-#. module: sale_margin
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "March"
@@ -307,6 +285,14 @@ msgstr "Kuu"
 msgid "Canceled"
 msgstr "Katkestatud"
 
+#. module: sale_margin
+#: model:ir.actions.act_window,help:sale_margin.action_report_account_invoice_report
+msgid ""
+"This report gives you an overview of all the invoices generated by the "
+"system. You can sort and group your results by specific selection criteria "
+"to quickly find what you are looking for."
+msgstr ""
+
 #. module: sale_margin
 #: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
 msgid "Invoice Report"
@@ -346,12 +332,23 @@ msgstr ""
 #~ msgid "Create invoices"
 #~ msgstr "Loo arved"
 
+#~ 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 "Destination Journal"
 #~ msgstr "Sihtkoha päevik"
 
 #~ msgid "All Months"
 #~ msgstr "Kõik kuud"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
+
 #~ msgid "Supplier Invoices"
 #~ msgstr "Tarnija arved"
 
diff --git a/addons/sale_margin/i18n/fr.po b/addons/sale_margin/i18n/fr.po
index b690d7c24a3..636b99dd702 100644
--- a/addons/sale_margin/i18n/fr.po
+++ b/addons/sale_margin/i18n/fr.po
@@ -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-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_margin
diff --git a/addons/sale_margin/i18n/pl.po b/addons/sale_margin/i18n/pl.po
index b5db5dc9eda..d5befb722aa 100644
--- a/addons/sale_margin/i18n/pl.po
+++ b/addons/sale_margin/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:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-07-26 15:12+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_margin
@@ -27,19 +27,6 @@ msgstr ""
 msgid "Customer Refund"
 msgstr "Korekta dla klienta"
 
-#. module: sale_margin
-#: 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: sale_margin
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
 #. module: sale_margin
 #: selection:report.account.invoice.product,type:0
 msgid "Customer Invoice"
@@ -82,11 +69,6 @@ msgstr "Projekt"
 msgid "Paid"
 msgstr "Zapłacono"
 
-#. module: sale_margin
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_stock_picking
 msgid "Picking List"
@@ -245,11 +227,6 @@ msgstr "Kwota"
 msgid "Supplier Refund"
 msgstr "Korekta od dostawcy"
 
-#. module: sale_margin
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Niewłaściwy XML dla architektury widoku!"
-
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "March"
@@ -308,6 +285,14 @@ msgstr "Miesiąc"
 msgid "Canceled"
 msgstr "Anulowano"
 
+#. module: sale_margin
+#: model:ir.actions.act_window,help:sale_margin.action_report_account_invoice_report
+msgid ""
+"This report gives you an overview of all the invoices generated by the "
+"system. You can sort and group your results by specific selection criteria "
+"to quickly find what you are looking for."
+msgstr ""
+
 #. module: sale_margin
 #: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
 msgid "Invoice Report"
@@ -344,12 +329,21 @@ msgstr "Otwarte"
 msgid "Invoice Analysis"
 msgstr ""
 
+#~ 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 "Invoices by Product"
 #~ msgstr "Faktury wg produktów"
 
 #~ msgid "Create invoices"
 #~ msgstr "Utwórz faktury"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Niewłaściwy XML dla architektury widoku!"
+
 #~ msgid "Invoices by partner"
 #~ msgstr "Faktury wg partnerów"
 
@@ -359,6 +353,9 @@ msgstr ""
 #~ msgid "All Months"
 #~ msgstr "Wszystkie miesiące"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
 #~ msgid "Supplier Invoices"
 #~ msgstr "Faktury od dostawców"
 
diff --git a/addons/sale_margin/i18n/pt.po b/addons/sale_margin/i18n/pt.po
index bc9e7eb92a7..86404b976f8 100644
--- a/addons/sale_margin/i18n/pt.po
+++ b/addons/sale_margin/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-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-09 08:01+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-11-10 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_margin
@@ -27,19 +27,6 @@ msgstr ""
 msgid "Customer Refund"
 msgstr "Reembolso ao Cliente"
 
-#. module: sale_margin
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O Nome do Objecto deve começar com x_ e não pode conter um carácter especial "
-"!"
-
-#. module: sale_margin
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome do modelo inválido na definição da acção."
-
 #. module: sale_margin
 #: selection:report.account.invoice.product,type:0
 msgid "Customer Invoice"
@@ -82,11 +69,6 @@ msgstr "Rascunho"
 msgid "Paid"
 msgstr "Pago"
 
-#. module: sale_margin
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_stock_picking
 msgid "Picking List"
@@ -245,11 +227,6 @@ msgstr "Montante"
 msgid "Supplier Refund"
 msgstr "Reembolso Fornecedor"
 
-#. module: sale_margin
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML Inválido para a Arquitectura de Vista!"
-
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "March"
@@ -308,6 +285,14 @@ msgstr "Mês"
 msgid "Canceled"
 msgstr "Cancelado"
 
+#. module: sale_margin
+#: model:ir.actions.act_window,help:sale_margin.action_report_account_invoice_report
+msgid ""
+"This report gives you an overview of all the invoices generated by the "
+"system. You can sort and group your results by specific selection criteria "
+"to quickly find what you are looking for."
+msgstr ""
+
 #. module: sale_margin
 #: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
 msgid "Invoice Report"
@@ -347,15 +332,27 @@ msgstr ""
 #~ msgid "report.account.invoice.product"
 #~ msgstr "report.account.invoice.product"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O Nome do Objecto deve começar com x_ e não pode conter um carácter especial "
+#~ "!"
+
 #~ msgid "Invoices by Product"
 #~ msgstr "Facturas por Produto"
 
 #~ msgid "Create invoices"
 #~ msgstr "Criar Facturas"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML Inválido para a Arquitectura de Vista!"
+
 #~ msgid "report.account.invoice.partner.product"
 #~ msgstr "report.account.invoice.partner.product"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome do modelo inválido na definição da acção."
+
 #~ msgid "All Months"
 #~ msgstr "Todos os Meses"
 
diff --git a/addons/sale_margin/i18n/ru.po b/addons/sale_margin/i18n/ru.po
index 1a91e261035..d4836417631 100644
--- a/addons/sale_margin/i18n/ru.po
+++ b/addons/sale_margin/i18n/ru.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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_margin
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/i18n/sl.po b/addons/sale_margin/i18n/sl.po
index 6bcb893ca6f..8545814f1c7 100644
--- a/addons/sale_margin/i18n/sl.po
+++ b/addons/sale_margin/i18n/sl.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:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-07-02 12:17+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-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_margin
@@ -27,18 +27,6 @@ msgstr ""
 msgid "Customer Refund"
 msgstr "Dobropis kupcu"
 
-#. module: sale_margin
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
-
-#. module: sale_margin
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Napačno ime modela v definiciji dejanja."
-
 #. module: sale_margin
 #: selection:report.account.invoice.product,type:0
 msgid "Customer Invoice"
@@ -81,11 +69,6 @@ msgstr "Osnutek"
 msgid "Paid"
 msgstr "Plačano"
 
-#. module: sale_margin
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_stock_picking
 msgid "Picking List"
@@ -244,11 +227,6 @@ msgstr "Znesek"
 msgid "Supplier Refund"
 msgstr "Dobropis dobavitelja"
 
-#. module: sale_margin
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda!"
-
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "March"
@@ -307,6 +285,14 @@ msgstr "Mesec"
 msgid "Canceled"
 msgstr "Preklicano"
 
+#. module: sale_margin
+#: model:ir.actions.act_window,help:sale_margin.action_report_account_invoice_report
+msgid ""
+"This report gives you an overview of all the invoices generated by the "
+"system. You can sort and group your results by specific selection criteria "
+"to quickly find what you are looking for."
+msgstr ""
+
 #. module: sale_margin
 #: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
 msgid "Invoice Report"
@@ -343,12 +329,20 @@ msgstr "Odpri"
 msgid "Invoice Analysis"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
+
 #~ msgid "Invoices by Product"
 #~ msgstr "Računi po proizvodih"
 
 #~ msgid "Create invoices"
 #~ msgstr "Ustvari račune"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda!"
+
 #~ msgid "Invoices by partner"
 #~ msgstr "Računi po partnerjih"
 
@@ -382,5 +376,8 @@ msgstr ""
 #~ msgid "Cancel"
 #~ msgstr "Prekliči"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Napačno ime modela v definiciji dejanja."
+
 #~ msgid "Invoices by partner and product"
 #~ msgstr "Računi po partnerjih in proizvodih"
diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index 998ca50b918..97fd3b29cef 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:
@@ -76,16 +76,16 @@ class stock_picking(osv.osv):
         'invoice_ids': fields.many2many('account.invoice', 'picking_invoice_rel', 'picking_id', 'invoice_id', 'Invoices', domain=[('type', '=', 'out_invoice')]),
     }
 
-    def create_invoice(self, cr, uid, ids, *args):
+    def action_invoice_create(self, cr, uid, ids, journal_id=False,
+            group=False, type='out_invoice', context=None):
         # need to carify with new requirement
         invoice_ids = []
-        margin_deduce = 0.0
         picking_obj = self.pool.get('stock.picking')
-        picking_obj.write(cr, uid, ids, {'invoice_state': '2binvoiced'})
-        res = picking_obj.action_invoice_create(cr, uid, ids, type='out_invoice', context={})
+        res = super(stock_picking, self).action_invoice_create(cr, uid, ids, journal_id=False,
+            group=False, type='out_invoice', context=None)
         invoice_ids = res.values()
         picking_obj.write(cr, uid, ids, {'invoice_ids': [[6, 0, invoice_ids]]})
-        return True
+        return res
 
 stock_picking()
 
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index 47cbe4c2878..201dd12d7a0 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -2,84 +2,80 @@
 <openerp>
 <data>
 
-	<record model="ir.ui.view" id="sale_margin_sale_order">
-		<field name="name">sale.order.margin.view.form</field>
-		<field name="type">form</field>
-		<field name="model">sale.order</field>
-		<field name="inherit_id" ref="sale.view_order_form" />
-		<field name="arch" type="xml">
-			<field name="amount_total" position="after">
-				<field name="margin"/>
-			</field>
-		</field>
-	</record>
-	
-	<record model="ir.ui.view" id="sale_margin_sale_order_line">
-		<field name="name">sale.order.line.margin.view.form</field>
-		<field name="type">form</field>
-		<field name="model">sale.order</field>
-		<field name="inherit_id" ref="sale.view_order_form" />
-		<field name="arch" type="xml">
-			<xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='price_unit']" position="after">
-				<field name="purchase_price"/>
-			</xpath>
-		</field>
-	</record>
-	
-	<record model="ir.ui.view" id="sale_margin_sale_order_line_form">
-		<field name="name">sale.order.line.tree.margin.view.form</field>
-		<field name="type">form</field>
-		<field name="model">sale.order</field>
-		<field name="inherit_id" ref="sale.view_order_form" />
-		<field name="arch" type="xml">
-		   <xpath expr="/form/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" position="after">
-				<field name="purchase_price"/>
-			</xpath>
-		</field>
-	</record>
-	
-	<record model="ir.ui.view" id="sale_margin_sale_order_tree">
-		<field name="name">sale.order.margin.view.tree</field>
-		<field name="type">tree</field>
-		<field name="model">sale.order</field>
-		<field name="inherit_id" ref="sale.view_order_tree" />
-		<field name="arch" type="xml">
-			<field name="state" position="after">
-				<field name="margin"/>
-			</field>
-		</field>
-	</record>
-   
-	<record model="ir.ui.view" id="sale_margin_sale_order_line_tree">
-		<field name="name">sale.order.margin.line.view.tree</field>
-		<field name="type">tree</field>
-		<field name="model">sale.order.line</field>
-		<field name="inherit_id" ref="sale.view_order_line_tree" />
-		<field name="arch" type="xml">
-			<field name="price_subtotal" position="after">
-				<field name="margin"/>
-			</field>
-		</field>
-	</record>	
-	
+    <record model="ir.ui.view" id="sale_margin_sale_order">
+        <field name="name">sale.order.margin.view.form</field>
+        <field name="type">form</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_form" />
+        <field name="arch" type="xml">
+            <field name="amount_total" position="after">
+                <field name="margin"/>
+            </field>
+        </field>
+    </record>
+    
+    <record model="ir.ui.view" id="sale_margin_sale_order_line">
+        <field name="name">sale.order.line.margin.view.form</field>
+        <field name="type">form</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_form" />
+        <field name="arch" type="xml">
+            <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='price_unit']" position="after">
+                <field name="purchase_price"/>
+            </xpath>
+        </field>
+    </record>
+    
+    <record model="ir.ui.view" id="sale_margin_sale_order_line_form">
+        <field name="name">sale.order.line.tree.margin.view.form</field>
+        <field name="type">form</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_form" />
+        <field name="arch" type="xml">
+           <xpath expr="/form/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" position="after">
+                <field name="purchase_price"/>
+            </xpath>
+        </field>
+    </record>
+    
+    <record model="ir.ui.view" id="sale_margin_sale_order_tree">
+        <field name="name">sale.order.margin.view.tree</field>
+        <field name="type">tree</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_tree" />
+        <field name="arch" type="xml">
+            <field name="state" position="after">
+                <field name="margin"/>
+            </field>
+        </field>
+    </record>
+   
+    <record model="ir.ui.view" id="sale_margin_sale_order_line_tree">
+        <field name="name">sale.order.margin.line.view.tree</field>
+        <field name="type">tree</field>
+        <field name="model">sale.order.line</field>
+        <field name="inherit_id" ref="sale.view_order_line_tree" />
+        <field name="arch" type="xml">
+            <field name="price_subtotal" position="after">
+                <field name="margin"/>
+            </field>
+        </field>
+    </record>    
+    
+    
+    <record model="ir.ui.view" id="view_picking_margin_out_form">
+        <field name="name">picking.margin.view.form</field>
+        <field name="type">form</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_out_form" />
+        <field name="arch" type="xml">
+        <xpath expr="/form/notebook/page[@string='Additional info']" position="after">
+            <page string="Customer Invoices">
+               <field colspan="4" name="invoice_ids" nolabel="1"/>
+            </page>    
+        </xpath>
+        </field>
+    </record>
     
-	<record model="ir.ui.view" id="view_picking_margin_out_form">
-		<field name="name">picking.margin.view.form</field>
-		<field name="type">form</field>
-		<field name="model">stock.picking</field>
-		<field name="inherit_id" ref="stock.view_picking_out_form" />
-		<field name="arch" type="xml">
-		<xpath expr="/form/notebook/page[@string='Additional info']" position="after">
-			<page string="Customer Invoices">
-                    <field colspan="4" name="invoice_ids" nolabel="1"/>
-					<group col="10" colspan="4">
-						<label colspan="6"/>
-						<button name="create_invoice" icon='gtk-execute' string="Create Invoice" type="object"/>	
-					</group>
-            </page>	
-		</xpath>
-		</field>
-	</record>
-	
 </data>
 </openerp>
diff --git a/addons/sale_mrp/i18n/de.po b/addons/sale_mrp/i18n/de.po
index de398ca3124..f30d05bfce7 100644
--- a/addons/sale_mrp/i18n/de.po
+++ b/addons/sale_mrp/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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-12-01 09:34+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-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_mrp
@@ -28,19 +28,6 @@ msgstr "Anzeige Kundenreferenz in Verkaufsauftrag"
 msgid "Indicate the name of sale order."
 msgstr "Zeigt die Bezeichnung für den Verkaufsauftrag"
 
-#. module: sale_mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter XML-Code für diese Ansicht!"
-
-#. module: sale_mrp
-#: 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: sale_mrp
 #: field:mrp.production,sale_name:0
 msgid "Sale Name"
@@ -51,16 +38,6 @@ msgstr "Verkauf Bezeichnung"
 msgid "Manufacturing Order"
 msgstr "Fertigungsauftrag"
 
-#. module: sale_mrp
-#: 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 !"
-
-#. module: sale_mrp
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: sale_mrp
 #: field:mrp.production,sale_ref:0
 msgid "Sale Reference"
@@ -72,6 +49,24 @@ msgid "Sales and MRP Management"
 msgstr "Verkauf und Fertigungsplanung"
 
 #. module: sale_mrp
-#: 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 !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#~ 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 "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/sale_mrp/i18n/es.po b/addons/sale_mrp/i18n/es.po
index 40b3e24200a..f58abb858dd 100644
--- a/addons/sale_mrp/i18n/es.po
+++ b/addons/sale_mrp/i18n/es.po
@@ -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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_mrp
diff --git a/addons/sale_mrp/i18n/et.po b/addons/sale_mrp/i18n/et.po
index 83876fe73d9..66b96296c0d 100644
--- a/addons/sale_mrp/i18n/et.po
+++ b/addons/sale_mrp/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:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-07 11:24+0000\n"
 "Last-Translator: lyyser <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-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_mrp
@@ -27,18 +27,6 @@ msgstr ""
 msgid "Indicate the name of sale order."
 msgstr ""
 
-#. module: sale_mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
-#. module: sale_mrp
-#: 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: sale_mrp
 #: field:mrp.production,sale_name:0
 msgid "Sale Name"
@@ -58,3 +46,16 @@ msgstr ""
 #: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
 msgid "Sales and MRP Management"
 msgstr ""
+
+#. module: sale_mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#~ 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!"
diff --git a/addons/sale_mrp/i18n/fr.po b/addons/sale_mrp/i18n/fr.po
index b7502bc2d49..696e3bab078 100644
--- a/addons/sale_mrp/i18n/fr.po
+++ b/addons/sale_mrp/i18n/fr.po
@@ -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-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_mrp
diff --git a/addons/sale_mrp/i18n/pl.po b/addons/sale_mrp/i18n/pl.po
index 5163499b7a2..c78978175ee 100644
--- a/addons/sale_mrp/i18n/pl.po
+++ b/addons/sale_mrp/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:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 03:52+0000\n"
 "Last-Translator: mga (Open ERP) <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-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_mrp
@@ -27,19 +27,6 @@ msgstr "Określ odnośnik klienta z zamówienia sprzedaży"
 msgid "Indicate the name of sale order."
 msgstr "Określ nazwę zamówienia sprzedaży"
 
-#. module: sale_mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Niewłaściwy XML dla architektury widoku!"
-
-#. module: sale_mrp
-#: 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: sale_mrp
 #: field:mrp.production,sale_name:0
 msgid "Sale Name"
@@ -60,6 +47,11 @@ msgstr "Odnośnik sprzedaży"
 msgid "Sales and MRP Management"
 msgstr "Zarządzanie sprzedażą i MRP"
 
+#. module: sale_mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
 #~ msgid ""
 #~ "\n"
 #~ "    This module provides facility to the user to install mrp and sale "
@@ -77,3 +69,12 @@ msgstr "Zarządzanie sprzedażą i MRP"
 #~ "    Moduł dodaje nazwę sprzedaży i odnośnik sprzedaży do \n"
 #~ "    zamówienia produkcji.\n"
 #~ "    "
+
+#~ 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 "Niewłaściwy XML dla architektury widoku!"
diff --git a/addons/sale_mrp/i18n/pt.po b/addons/sale_mrp/i18n/pt.po
index 3cefccaf9cd..06db4d8996f 100644
--- a/addons/sale_mrp/i18n/pt.po
+++ b/addons/sale_mrp/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-04 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_mrp
diff --git a/addons/sale_mrp/i18n/pt_BR.po b/addons/sale_mrp/i18n/pt_BR.po
index e97699e92e2..86002ec1252 100644
--- a/addons/sale_mrp/i18n/pt_BR.po
+++ b/addons/sale_mrp/i18n/pt_BR.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-12 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_mrp
diff --git a/addons/sale_mrp/i18n/ru.po b/addons/sale_mrp/i18n/ru.po
index d87cdadc237..8bc2cba8c41 100644
--- a/addons/sale_mrp/i18n/ru.po
+++ b/addons/sale_mrp/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:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-10-27 07:59+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-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_mrp
@@ -27,19 +27,6 @@ msgstr ""
 msgid "Indicate the name of sale order."
 msgstr ""
 
-#. module: sale_mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
-
-#. module: sale_mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
 #. module: sale_mrp
 #: field:mrp.production,sale_name:0
 msgid "Sale Name"
@@ -59,3 +46,17 @@ msgstr "Ссылка на продажу"
 #: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
 msgid "Sales and MRP Management"
 msgstr "Управление продажами и план. произв. рес."
+
+#. module: sale_mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+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 для просмотра архитектуры!"
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/i18n/sl.po b/addons/sale_mrp/i18n/sl.po
index 13d37b91443..7fa500f6844 100644
--- a/addons/sale_mrp/i18n/sl.po
+++ b/addons/sale_mrp/i18n/sl.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:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 03:51+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_mrp
@@ -27,18 +27,6 @@ msgstr ""
 msgid "Indicate the name of sale order."
 msgstr ""
 
-#. module: sale_mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda!"
-
-#. module: sale_mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
-
 #. module: sale_mrp
 #: field:mrp.production,sale_name:0
 msgid "Sale Name"
@@ -58,3 +46,16 @@ msgstr ""
 #: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
 msgid "Sales and MRP Management"
 msgstr ""
+
+#. module: sale_mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda!"
diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py
index 03ae1e57f0f..ae1df1eb946 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 be5f02e8b03..60595903ab8 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/ar.po b/addons/stock/i18n/ar.po
index c7bae6abced..e9be82e2ce0 100644
--- a/addons/stock/i18n/ar.po
+++ b/addons/stock/i18n/ar.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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/bg.po b/addons/stock/i18n/bg.po
index 84445160699..0eff5f6dc85 100644
--- a/addons/stock/i18n/bg.po
+++ b/addons/stock/i18n/bg.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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/bs.po b/addons/stock/i18n/bs.po
index 188b9d759cd..88d1e178e49 100644
--- a/addons/stock/i18n/bs.po
+++ b/addons/stock/i18n/bs.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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/ca.po b/addons/stock/i18n/ca.po
index 019eb256c87..149704d1789 100644
--- a/addons/stock/i18n/ca.po
+++ b/addons/stock/i18n/ca.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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/cs.po b/addons/stock/i18n/cs.po
index 831f98759de..f972b93b556 100644
--- a/addons/stock/i18n/cs.po
+++ b/addons/stock/i18n/cs.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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index af16dcbdba8..b40be16e0c3 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.po
@@ -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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/el.po b/addons/stock/i18n/el.po
index 26f8a9953f2..ed758aa48cf 100644
--- a/addons/stock/i18n/el.po
+++ b/addons/stock/i18n/el.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-14 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index c991da48b34..a35522c3a68 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.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-14 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/es_AR.po b/addons/stock/i18n/es_AR.po
index 9d1b4af57a0..a62aed0afee 100644
--- a/addons/stock/i18n/es_AR.po
+++ b/addons/stock/i18n/es_AR.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/es_EC.po b/addons/stock/i18n/es_EC.po
index 69407255bf5..409c0437840 100644
--- a/addons/stock/i18n/es_EC.po
+++ b/addons/stock/i18n/es_EC.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/et.po b/addons/stock/i18n/et.po
index c8226b5cd1b..dadc9fffddf 100644
--- a/addons/stock/i18n/et.po
+++ b/addons/stock/i18n/et.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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/fi.po b/addons/stock/i18n/fi.po
index 0ab940d7731..002fa8d560e 100644
--- a/addons/stock/i18n/fi.po
+++ b/addons/stock/i18n/fi.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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index 4d19c53d10d..de9cded5f60 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/gl.po b/addons/stock/i18n/gl.po
index ba2200e5d1d..c05949da24e 100644
--- a/addons/stock/i18n/gl.po
+++ b/addons/stock/i18n/gl.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-14 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/hr.po b/addons/stock/i18n/hr.po
index d70bd5528af..1442697f426 100644
--- a/addons/stock/i18n/hr.po
+++ b/addons/stock/i18n/hr.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-14 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/hu.po b/addons/stock/i18n/hu.po
index 919f4390cfc..85c3ae42796 100644
--- a/addons/stock/i18n/hu.po
+++ b/addons/stock/i18n/hu.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-14 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/id.po b/addons/stock/i18n/id.po
index 43dd8b45a82..26bf4e65198 100644
--- a/addons/stock/i18n/id.po
+++ b/addons/stock/i18n/id.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-14 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po
index 044a9841a5f..4c72ff832c3 100644
--- a/addons/stock/i18n/it.po
+++ b/addons/stock/i18n/it.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-14 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/ko.po b/addons/stock/i18n/ko.po
index 31c4b1e4283..0513332d2db 100644
--- a/addons/stock/i18n/ko.po
+++ b/addons/stock/i18n/ko.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-14 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/lt.po b/addons/stock/i18n/lt.po
index d337658197f..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-14 04:59+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/mn.po b/addons/stock/i18n/mn.po
index f7309548564..423a0dd632f 100644
--- a/addons/stock/i18n/mn.po
+++ b/addons/stock/i18n/mn.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-14 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index 383ccbc6d69..b87d5f3b583 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/nl_BE.po b/addons/stock/i18n/nl_BE.po
index ecbdf0cabd4..1142f537520 100644
--- a/addons/stock/i18n/nl_BE.po
+++ b/addons/stock/i18n/nl_BE.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index 36d20561ce3..d91ecb741ae 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.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-14 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pt.po b/addons/stock/i18n/pt.po
index 13403807886..ab84fde95bb 100644
--- a/addons/stock/i18n/pt.po
+++ b/addons/stock/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-12 17:12+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 03:43+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 04:59+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/pt_BR.po b/addons/stock/i18n/pt_BR.po
index 550c5d3ff69..312b5dabf9e 100644
--- a/addons/stock/i18n/pt_BR.po
+++ b/addons/stock/i18n/pt_BR.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/ro.po b/addons/stock/i18n/ro.po
index 5c790ec49ba..4790917abb1 100644
--- a/addons/stock/i18n/ro.po
+++ b/addons/stock/i18n/ro.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-14 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index 39ae0f0e04e..92c78fb6b9b 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/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-13 12:52+0000\n"
+"PO-Revision-Date: 2010-12-14 22:39+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-14 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/sl.po b/addons/stock/i18n/sl.po
index 9a402a51267..72a923c30a5 100644
--- a/addons/stock/i18n/sl.po
+++ b/addons/stock/i18n/sl.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-14 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/sq.po b/addons/stock/i18n/sq.po
index 94ae370effd..9ae72eda8f1 100644
--- a/addons/stock/i18n/sq.po
+++ b/addons/stock/i18n/sq.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-14 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/sr.po b/addons/stock/i18n/sr.po
index 6847baa4848..9b457462aac 100644
--- a/addons/stock/i18n/sr.po
+++ b/addons/stock/i18n/sr.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-14 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:41+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/sv.po b/addons/stock/i18n/sv.po
index 87a1761b76c..50817d9e0e1 100644
--- a/addons/stock/i18n/sv.po
+++ b/addons/stock/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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/th.po b/addons/stock/i18n/th.po
index dfc69f0f5f2..1f30428224c 100644
--- a/addons/stock/i18n/th.po
+++ b/addons/stock/i18n/th.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/tlh.po b/addons/stock/i18n/tlh.po
index 0d1f58fa158..ad738a2138e 100644
--- a/addons/stock/i18n/tlh.po
+++ b/addons/stock/i18n/tlh.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index c3c54663dfb..d56d55211f4 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/uk.po b/addons/stock/i18n/uk.po
index 392a358885c..e4599c3c096 100644
--- a/addons/stock/i18n/uk.po
+++ b/addons/stock/i18n/uk.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/vi.po b/addons/stock/i18n/vi.po
index ab9a134169c..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-14 05:00+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 e5c81b7833e..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-09 11:29+0000\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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -42,7 +42,7 @@ msgstr "固定连锁库位"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Put in a new pack"
-msgstr ""
+msgstr "放到新包装"
 
 #. module: stock
 #: field:stock.move.split.lines,action:0
@@ -58,7 +58,7 @@ msgstr "向上追溯"
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
 #: model:ir.ui.menu,name:stock.menu_report_stock_line_date
 msgid "Last Product Inventories"
-msgstr ""
+msgstr "最近的产品盘存单"
 
 #. module: stock
 #: view:stock.move:0
@@ -80,7 +80,7 @@ msgstr ""
 msgid ""
 "This is the list of all delivery orders that must be prepared, according to "
 "your different sales orders and your logistics rules."
-msgstr ""
+msgstr "这是根据不同的销售订单和物流规则所有准备好的发货单据"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_move_report
@@ -99,7 +99,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Picking list"
-msgstr ""
+msgstr "分拣单"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:0
@@ -129,7 +129,7 @@ msgstr "数量"
 #: view:report.stock.move:0
 #: field:report.stock.move,day:0
 msgid "Day"
-msgstr ""
+msgstr "天"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -157,7 +157,7 @@ msgstr "库存业务类型"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
-msgstr ""
+msgstr "进仓"
 
 #. module: stock
 #: help:product.category,property_stock_account_output_categ:0
@@ -172,12 +172,12 @@ msgstr ""
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Missing partial picking data for move #%s"
-msgstr ""
+msgstr "部分分拣单的库存调拨数据丢失#%s"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_move
 msgid "Deliver/Receive Products"
-msgstr ""
+msgstr "送货单"
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:0
@@ -197,24 +197,24 @@ msgstr ""
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Not Applicable"
-msgstr ""
+msgstr "无效"
 
 #. module: stock
 #: help:stock.tracking,serial:0
 msgid "Other reference or serial number"
-msgstr ""
+msgstr "其它参考或序列号"
 
 #. module: stock
 #: field:stock.move,origin:0
 #: view:stock.picking:0
 #: field:stock.picking,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "源"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
 msgid "Configuration"
-msgstr "设置"
+msgstr "配置"
 
 #. module: stock
 #: view:stock.tracking:0
@@ -252,7 +252,7 @@ msgstr ""
 #. module: stock
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "错误!你不能创建递归的分类"
 
 #. module: stock
 #: help:stock.fill.inventory,set_stock_zero:0
@@ -279,13 +279,13 @@ msgstr ""
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "You cannot cancel picking because stock move is in done state !"
-msgstr ""
+msgstr "库存调拨是完成的状态不能取消分拣单"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "警告!"
 
 #. module: stock
 #: field:stock.invoice.onshipping,group:0
@@ -302,6 +302,10 @@ msgid ""
 "   \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
+"新建的库存调拨状态是‘草稿’\n"
+"然后将为‘确认’\n"
+"如果库存可用状态将为‘可用’\n"
+"当分拣完成状态将为‘完成’"
 
 #. module: stock
 #: model:ir.model,name:stock.model_res_partner
@@ -325,7 +329,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_return_picking.py:0
 #, python-format
 msgid "No invoicing"
-msgstr ""
+msgstr "无发票"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot
@@ -337,7 +341,7 @@ msgstr "生产批次"
 #. module: stock
 #: help:stock.incoterms,code:0
 msgid "Code for Incoterms"
-msgstr ""
+msgstr "贸易术语编号"
 
 #. module: stock
 #: field:stock.tracking,move_ids:0
diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po
index a24bcd7d5dd..c64f490b77b 100644
--- a/addons/stock/i18n/zh_TW.po
+++ b/addons/stock/i18n/zh_TW.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+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/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index e1a22e9fb69..a2234521218 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -3,8 +3,8 @@
 "access_stock_incoterms_manager","stock.incoterms manager","model_stock_incoterms","stock.group_stock_manager",1,1,1,1
 "access_stock_warehouse_manager","stock.warehouse.manager","model_stock_warehouse","stock.group_stock_manager",1,1,1,1
 "access_stock_warehouse_user","stock.warehouse.user","model_stock_warehouse","base.group_user",1,0,0,0
-"access_stock_location_manager","stock.location.manager","model_stock_location","stock.group_stock_manager",1,0,0,0
-"access_stock_location_user","stock.location.user","model_stock_location","base.group_user",1,1,1,1
+"access_stock_location_manager","stock.location.manager","model_stock_location","stock.group_stock_manager",1,1,1,1
+"access_stock_location_user","stock.location.user","model_stock_location","base.group_user",1,0,0,0
 "access_stock_journal_user","stock.journal.user","model_stock_journal","base.group_user",1,0,0,0
 "access_stock_journal_manager","stock.journal.manager","model_stock_journal","stock.group_stock_manager",1,1,1,1
 "access_stock_tracking_user","stock.tracking user","model_stock_tracking","stock.group_stock_user",1,1,1,1
@@ -29,7 +29,12 @@
 "access_report_stock_move_manager","report.stock.move manager","model_report_stock_move","stock.group_stock_manager",1,1,1,1
 "access_report_stock_inventory_user","report.stock.inventory user","model_report_stock_inventory","stock.group_stock_user",1,1,1,1
 "access_report_stock_inventory_manager","report.stock.inventory manager","model_report_stock_inventory","stock.group_stock_manager",1,1,1,1
-"access_product_product_stock_user","product_product_stock_user","product.model_product_product","stock.group_stock_user",1,1,1,1
-"access_product_template_stock_user","product.template stock user","product.model_product_template","stock.group_stock_user",1,1,1,1
+"access_product_product_stock_user","product_product_stock_user","product.model_product_product","stock.group_stock_user",1,0,0,0
+"access_product_template_stock_user","product.template stock user","product.model_product_template","stock.group_stock_user",1,0,0,0
 "access_product_product_stock_manager","product_product_stock_manager","product.model_product_product","stock.group_stock_manager",1,0,0,0
 "access_product_template_stock_manager","product.template stock manager","product.model_product_template","stock.group_stock_manager",1,0,0,0
+"access_account_invoice_user","account.invoice stock user","account.model_account_invoice","stock.group_stock_user",1,1,1,0
+"access_account_invoice_line_user","account.invoice.line stock user","account.model_account_invoice_line","stock.group_stock_user",1,1,1,0
+"access_account_invoice_tax_user","account.invoice.tax stock user","account.model_account_invoice_tax","stock.group_stock_user",1,1,1,0
+"access_account_journal_user","account.journal stock user","account.model_account_journal","stock.group_stock_user",1,0,0,0
+"access_account_fiscalyear","account.fiscalyear stock user","account.model_account_fiscalyear","stock.group_stock_user",1,0,0,0
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index fd0c8597a6e..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
@@ -608,7 +606,7 @@ class stock_picking(osv.osv):
                 "Set a location if you produce at a fixed location. This can be a partner location " \
                 "if you subcontract the manufacturing operations.", select=True),
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location',help="Location where the system will stock the finished products.", select=True),
-        'move_type': fields.selection([('direct', 'Direct Delivery'), ('one', 'All at once')], 'Delivery Method', required=True, help="It specifies goods to be delivered all at once or by direct delivery"),
+        'move_type': fields.selection([('direct', 'Partial Delivery'), ('one', 'All at once')], 'Delivery Method', required=True, help="It specifies goods to be delivered all at once or by direct delivery"),
         'state': fields.selection([
             ('draft', 'Draft'),
             ('auto', 'Waiting'),
@@ -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/stock_view.xml b/addons/stock/stock_view.xml
index eeb0a92d019..f3780d23e03 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -152,8 +152,8 @@
                     </group>
                     <group col="2" colspan="2">
                         <button name="action_cancel_inventary" states="draft" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
-                        <button name="action_confirm" states="draft" string="Validate Inventory" type="object" icon="gtk-apply"/>
-                        <button name="action_done" states="confirm" string="Confirm Inventory" type="object" icon="gtk-jump-to"/>
+                        <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
+                        <button name="action_done" states="confirm" string="Validate Inventory" type="object" icon="gtk-jump-to"/>
                         <button name="action_cancel" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                     </group>
                 </form>
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 9af23888b4d..091049b5689 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -40,13 +40,13 @@ class stock_invoice_onshipping(osv.osv_memory):
         pick_types = list(set(map(lambda x: x.type, model_pool.browse(cr, uid, res_ids, context=context))))
         for type in pick_types:
             if type == 'out':
-               value = acct_obj.search(cr, uid, [('type', 'in',('sale','sale_refund') )])
+               value = acct_obj.search(cr, uid, [('type', 'in',('sale','purchase_refund') )])
                for jr_type in acct_obj.browse(cr, uid, value, context=context):
                    t1 = jr_type.id,jr_type.name
                    vals.append(t1)
 
             elif type == 'in':
-               value = acct_obj.search(cr, uid, [('type', 'in',('purchase','purchase_refund') )])
+               value = acct_obj.search(cr, uid, [('type', 'in',('purchase','sale_refund') )])
                for jr_type in acct_obj.browse(cr, uid, value, context=context):
                    t1 = jr_type.id,jr_type.name
                    vals.append(t1)
@@ -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 cf6f7c4b1bd..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 = {}
@@ -78,7 +82,7 @@ class stock_return_picking(osv.osv_memory):
                     return_history[m.id] = 0
                     for rec in m.move_history_ids2:
                         return_history[m.id] += (rec.product_qty * rec.product_uom.factor)
-                    if m.product_qty * m.product_uom.factor > return_history[m.id]:
+                    if m.product_qty * m.product_uom.factor >= return_history[m.id]:
                         valid_lines += 1
                         if 'return%s'%(m.id) not in self._columns:
                             self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
@@ -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/ar.po b/addons/stock_invoice_directly/i18n/ar.po
index 33469bfc8e8..f9647fbd492 100644
--- a/addons/stock_invoice_directly/i18n/ar.po
+++ b/addons/stock_invoice_directly/i18n/ar.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-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 01:57+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -25,9 +25,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "فاتورة الدفع المباشر"
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/bg.po b/addons/stock_invoice_directly/i18n/bg.po
index 1804de25bf6..e9f61d5aab9 100644
--- a/addons/stock_invoice_directly/i18n/bg.po
+++ b/addons/stock_invoice_directly/i18n/bg.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-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 01:57+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -25,9 +25,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Фактуриране и директно натоварване"
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/bs.po b/addons/stock_invoice_directly/i18n/bs.po
index 7e4511e1af9..23edbefddbe 100644
--- a/addons/stock_invoice_directly/i18n/bs.po
+++ b/addons/stock_invoice_directly/i18n/bs.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-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 01:57+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -25,9 +25,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Fakturiši primku direktno"
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/ca.po b/addons/stock_invoice_directly/i18n/ca.po
index d676bf2cf3f..e569e4ea81b 100644
--- a/addons/stock_invoice_directly/i18n/ca.po
+++ b/addons/stock_invoice_directly/i18n/ca.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-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 01:54+0000\n"
 "Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -25,9 +25,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Factura albarà directament"
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/cs.po b/addons/stock_invoice_directly/i18n/cs.po
index 5e82320f178..7a40ad457b7 100644
--- a/addons/stock_invoice_directly/i18n/cs.po
+++ b/addons/stock_invoice_directly/i18n/cs.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-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-11-17 10:52+0000\n"
 "Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -25,9 +25,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Přímé vybírání faktur"
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/da.po b/addons/stock_invoice_directly/i18n/da.po
index 7c1dfd1019d..54e891f3fa4 100644
--- a/addons/stock_invoice_directly/i18n/da.po
+++ b/addons/stock_invoice_directly/i18n/da.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:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-11-17 10:52+0000\n"
 "Last-Translator: SmartWi <kurt@smartwi.net>\n"
 "Language-Team: Danish <da@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:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -26,9 +26,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Dirkte faktura træk"
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/de.po b/addons/stock_invoice_directly/i18n/de.po
index 32094e7447f..9fe242f8521 100644
--- a/addons/stock_invoice_directly/i18n/de.po
+++ b/addons/stock_invoice_directly/i18n/de.po
@@ -6,7 +6,7 @@ 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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-12-01 07:04+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,14 +14,9 @@ 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-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: stock_invoice_directly
-#: 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 !"
-
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
 msgid "Partial Picking"
@@ -32,15 +27,14 @@ msgstr "Teilleiferung"
 msgid "Invoice Picking Directly"
 msgstr "Rechnung direkt von Lieferung"
 
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen \r\n"
-"beinhalten"
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen \r\n"
+#~ "beinhalten"
 
-#. module: stock_invoice_directly
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig 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 !"
diff --git a/addons/stock_invoice_directly/i18n/el.po b/addons/stock_invoice_directly/i18n/el.po
index f50c9a9fd80..5ad9320aba7 100644
--- a/addons/stock_invoice_directly/i18n/el.po
+++ b/addons/stock_invoice_directly/i18n/el.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:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-09-08 15:49+0000\n"
 "Last-Translator: Makis Nicolaou <mark.nicolaou@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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -26,9 +26,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Απευθείας Τιμολόγηση"
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/es.po b/addons/stock_invoice_directly/i18n/es.po
index f19b30578e8..4cafd5dd94b 100644
--- a/addons/stock_invoice_directly/i18n/es.po
+++ b/addons/stock_invoice_directly/i18n/es.po
@@ -6,7 +6,7 @@ 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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-23 09:23+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,14 +14,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: stock_invoice_directly
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
 msgid "Partial Picking"
@@ -32,15 +27,14 @@ msgstr "Albarán parcial"
 msgid "Invoice Picking Directly"
 msgstr "Facturar albarán directamente"
 
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
 
-#. module: stock_invoice_directly
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/stock_invoice_directly/i18n/es_AR.po b/addons/stock_invoice_directly/i18n/es_AR.po
index a633af9ca17..56f58faccf9 100644
--- a/addons/stock_invoice_directly/i18n/es_AR.po
+++ b/addons/stock_invoice_directly/i18n/es_AR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-20 21:37+0000\n"
 "Last-Translator: Margarita Manterola <ubuntu@marga.com.ar>\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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -25,9 +25,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Facturar directamente desde remito"
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/et.po b/addons/stock_invoice_directly/i18n/et.po
index 4bc01457677..c60f3c3acf0 100644
--- a/addons/stock_invoice_directly/i18n/et.po
+++ b/addons/stock_invoice_directly/i18n/et.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-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-11-09 20:14+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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -25,9 +25,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Arve otsenope"
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/fr.po b/addons/stock_invoice_directly/i18n/fr.po
index 5e7fc296523..597a9b7e7ac 100644
--- a/addons/stock_invoice_directly/i18n/fr.po
+++ b/addons/stock_invoice_directly/i18n/fr.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-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/gl.po b/addons/stock_invoice_directly/i18n/gl.po
index 585521955f1..fc64648024f 100644
--- a/addons/stock_invoice_directly/i18n/gl.po
+++ b/addons/stock_invoice_directly/i18n/gl.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: stock-invoice-directly-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-08-17 08:30+0000\n"
 "Last-Translator: Frco. Javier Rial <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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -27,9 +27,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Facturar albarán directamente"
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/hr.po b/addons/stock_invoice_directly/i18n/hr.po
index 639ab3a61f0..012035b792d 100644
--- a/addons/stock_invoice_directly/i18n/hr.po
+++ b/addons/stock_invoice_directly/i18n/hr.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-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 01:31+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -25,9 +25,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Izravan odabir računa"
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/hu.po b/addons/stock_invoice_directly/i18n/hu.po
index 317e981d6d0..d9dbc00049b 100644
--- a/addons/stock_invoice_directly/i18n/hu.po
+++ b/addons/stock_invoice_directly/i18n/hu.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-04-10 14:08+0000\n"
 "Last-Translator: <>\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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -25,9 +25,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr ""
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/id.po b/addons/stock_invoice_directly/i18n/id.po
index 1ca4202c12a..4f4537ec2d8 100644
--- a/addons/stock_invoice_directly/i18n/id.po
+++ b/addons/stock_invoice_directly/i18n/id.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-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-11-09 13:58+0000\n"
 "Last-Translator: <>\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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -25,9 +25,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr ""
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/it.po b/addons/stock_invoice_directly/i18n/it.po
index 8b8fce5caab..4d4f51b4865 100644
--- a/addons/stock_invoice_directly/i18n/it.po
+++ b/addons/stock_invoice_directly/i18n/it.po
@@ -6,21 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-24 09:29+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-11-25 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: stock_invoice_directly
-#: 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!"
-
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
 msgid "Partial Picking"
@@ -31,15 +26,14 @@ msgstr "Prelievo Parziale"
 msgid "Invoice Picking Directly"
 msgstr "Fattura Picking Direttamente"
 
-#. module: stock_invoice_directly
-#: 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 deve contenere "
-"caratteri speciali!"
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Il nome del modulo deve essere univoco!"
 
-#. module: stock_invoice_directly
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere univoco!"
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "L'ID del certificato del modulo deve essere unico!"
+
+#~ 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 deve contenere "
+#~ "caratteri speciali!"
diff --git a/addons/stock_invoice_directly/i18n/ko.po b/addons/stock_invoice_directly/i18n/ko.po
index b701be538af..1c6ed224910 100644
--- a/addons/stock_invoice_directly/i18n/ko.po
+++ b/addons/stock_invoice_directly/i18n/ko.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:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-09-08 16:15+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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -26,9 +26,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "직접 인보이스 피킹"
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/lt.po b/addons/stock_invoice_directly/i18n/lt.po
index 317e981d6d0..d9dbc00049b 100644
--- a/addons/stock_invoice_directly/i18n/lt.po
+++ b/addons/stock_invoice_directly/i18n/lt.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-04-10 14:08+0000\n"
 "Last-Translator: <>\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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -25,9 +25,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr ""
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/mn.po b/addons/stock_invoice_directly/i18n/mn.po
index ac2ff497229..e1d3f530a40 100644
--- a/addons/stock_invoice_directly/i18n/mn.po
+++ b/addons/stock_invoice_directly/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:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-11 05:38+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:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -26,9 +26,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Түүврийг шууд нэхэмжлэх"
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/nl.po b/addons/stock_invoice_directly/i18n/nl.po
index 20e756b1d2e..85e4bbd912b 100644
--- a/addons/stock_invoice_directly/i18n/nl.po
+++ b/addons/stock_invoice_directly/i18n/nl.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-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-07 02: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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -25,9 +25,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Direct factureren bij picking"
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/nl_BE.po b/addons/stock_invoice_directly/i18n/nl_BE.po
index c8a0775ea1b..f5d70247419 100644
--- a/addons/stock_invoice_directly/i18n/nl_BE.po
+++ b/addons/stock_invoice_directly/i18n/nl_BE.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-04-24 15:43+0000\n"
 "Last-Translator: <>\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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -25,9 +25,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr ""
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/pl.po b/addons/stock_invoice_directly/i18n/pl.po
index 8cb51863c31..358da98921c 100644
--- a/addons/stock_invoice_directly/i18n/pl.po
+++ b/addons/stock_invoice_directly/i18n/pl.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-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-03 01:28+0000\n"
 "Last-Translator: mga (Open ERP) <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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -25,9 +25,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Bezpośrednie fakturowanie pobrania"
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/pt.po b/addons/stock_invoice_directly/i18n/pt.po
index 8f67458875c..bb32cbade5a 100644
--- a/addons/stock_invoice_directly/i18n/pt.po
+++ b/addons/stock_invoice_directly/i18n/pt.po
@@ -6,21 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-26 23: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-11-28 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: stock_invoice_directly
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "O ID do certificado do módulo tem de ser único!"
-
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
 msgid "Partial Picking"
@@ -31,15 +26,14 @@ msgstr "Recolha parcial"
 msgid "Invoice Picking Directly"
 msgstr "Escolher Directamente a Factura"
 
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
-"especial !"
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "O nome do módulo deve ser único!"
 
-#. module: stock_invoice_directly
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo deve ser único!"
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID do certificado do módulo tem de ser único!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
+#~ "especial !"
diff --git a/addons/stock_invoice_directly/i18n/pt_BR.po b/addons/stock_invoice_directly/i18n/pt_BR.po
index 77f5cad0871..cc46c4b1be3 100644
--- a/addons/stock_invoice_directly/i18n/pt_BR.po
+++ b/addons/stock_invoice_directly/i18n/pt_BR.po
@@ -6,21 +6,16 @@ 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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-26 23:31+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-11-28 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: stock_invoice_directly
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "O ID de certificado do módulo precisa ser único !"
-
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
 msgid "Partial Picking"
@@ -31,15 +26,14 @@ msgstr "Separação Parcial"
 msgid "Invoice Picking Directly"
 msgstr "Composição direta da Fatura"
 
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-"especial!"
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "O nome do módulo precisa ser único !"
 
-#. module: stock_invoice_directly
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo precisa ser único !"
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID de certificado do módulo precisa ser único !"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
+#~ "especial!"
diff --git a/addons/stock_invoice_directly/i18n/ro.po b/addons/stock_invoice_directly/i18n/ro.po
index 5e988eb9f71..ae71fe8ea9b 100644
--- a/addons/stock_invoice_directly/i18n/ro.po
+++ b/addons/stock_invoice_directly/i18n/ro.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-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-09-08 16:48+0000\n"
 "Last-Translator: filsys <office@filsystem.ro>\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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -25,9 +25,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr ""
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/ru.po b/addons/stock_invoice_directly/i18n/ru.po
index fba86fde0ed..793a118a564 100644
--- a/addons/stock_invoice_directly/i18n/ru.po
+++ b/addons/stock_invoice_directly/i18n/ru.po
@@ -6,21 +6,16 @@ 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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-30 17:44+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-01 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: stock_invoice_directly
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
 msgid "Partial Picking"
@@ -31,15 +26,14 @@ msgstr "Частичное комплектование"
 msgid "Invoice Picking Directly"
 msgstr "Напрямую выставляемый счет"
 
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
 
-#. module: stock_invoice_directly
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Название модуля должно быть уникальным !"
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Название модуля должно быть уникальным !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
diff --git a/addons/stock_invoice_directly/i18n/sl.po b/addons/stock_invoice_directly/i18n/sl.po
index 21be95c361f..2ff94b11c73 100644
--- a/addons/stock_invoice_directly/i18n/sl.po
+++ b/addons/stock_invoice_directly/i18n/sl.po
@@ -6,21 +6,16 @@ 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-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-27 00:53+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-11-28 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: stock_invoice_directly
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Oznaka certifikata modula mora biti enolična!"
-
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
 msgid "Partial Picking"
@@ -31,14 +26,13 @@ msgstr ""
 msgid "Invoice Picking Directly"
 msgstr "Neposredna izbira računa"
 
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Ime modula mora biti enolično!"
 
-#. module: stock_invoice_directly
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Ime modula mora biti enolično!"
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Oznaka certifikata modula mora biti enolična!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
diff --git a/addons/stock_invoice_directly/i18n/sq.po b/addons/stock_invoice_directly/i18n/sq.po
index 6f8be707bf9..5bfa208de22 100644
--- a/addons/stock_invoice_directly/i18n/sq.po
+++ b/addons/stock_invoice_directly/i18n/sq.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:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-02 14:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -26,9 +26,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr ""
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/sr.po b/addons/stock_invoice_directly/i18n/sr.po
index c47042ace2a..080353e0ae5 100644
--- a/addons/stock_invoice_directly/i18n/sr.po
+++ b/addons/stock_invoice_directly/i18n/sr.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:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-09-29 06:34+0000\n"
 "Last-Translator: Sonja Sardelić <sardelic.sonja@gmail.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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -26,9 +26,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Direktan izbor fakture"
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
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/i18n/sv.po b/addons/stock_invoice_directly/i18n/sv.po
index 65338e6f390..7663276f5e0 100644
--- a/addons/stock_invoice_directly/i18n/sv.po
+++ b/addons/stock_invoice_directly/i18n/sv.po
@@ -6,21 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-22 20:07+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <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-11-23 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: stock_invoice_directly
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
 msgid "Partial Picking"
@@ -30,14 +25,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Invoice Picking Directly"
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: stock_invoice_directly
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/tr.po b/addons/stock_invoice_directly/i18n/tr.po
index 8afe302f1a9..77e2ee6d1f1 100644
--- a/addons/stock_invoice_directly/i18n/tr.po
+++ b/addons/stock_invoice_directly/i18n/tr.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-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-09 07:15+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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -25,9 +25,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr ""
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/uk.po b/addons/stock_invoice_directly/i18n/uk.po
index d50a311cfb2..9ee82e2b625 100644
--- a/addons/stock_invoice_directly/i18n/uk.po
+++ b/addons/stock_invoice_directly/i18n/uk.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-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-04-10 14:08+0000\n"
 "Last-Translator: <>\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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -25,9 +25,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr ""
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/vi.po b/addons/stock_invoice_directly/i18n/vi.po
index 822a7865685..ed7ec581bbf 100644
--- a/addons/stock_invoice_directly/i18n/vi.po
+++ b/addons/stock_invoice_directly/i18n/vi.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:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-02 14:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -26,9 +26,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr ""
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/zh_CN.po b/addons/stock_invoice_directly/i18n/zh_CN.po
index 25bfee58833..cf4236b2aea 100644
--- a/addons/stock_invoice_directly/i18n/zh_CN.po
+++ b/addons/stock_invoice_directly/i18n/zh_CN.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-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-29 09:44+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -25,9 +25,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "根据分拣单开发票"
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/zh_TW.po b/addons/stock_invoice_directly/i18n/zh_TW.po
index 317e981d6d0..d9dbc00049b 100644
--- a/addons/stock_invoice_directly/i18n/zh_TW.po
+++ b/addons/stock_invoice_directly/i18n/zh_TW.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2009-04-10 14:08+0000\n"
 "Last-Translator: <>\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-10-30 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -25,9 +25,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr ""
-
-#. module: stock_invoice_directly
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
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/security/ir.model.access.csv b/addons/stock_location/security/ir.model.access.csv
index fc4eeff788b..f1e7bd33a84 100644
--- a/addons/stock_location/security/ir.model.access.csv
+++ b/addons/stock_location/security/ir.model.access.csv
@@ -3,8 +3,10 @@
 "access_product_pulled_flow_manager","product_pulled_flow manager","model_product_pulled_flow","stock.group_stock_manager",1,1,1,1
 "access_product_pulled_flow_partner_manager","product_pulled_flow partner manager","model_product_pulled_flow","product.group_product_manager",1,1,1,1
 "access_stock_location_path_user","stock location path user","model_stock_location_path","stock.group_stock_user",1,0,0,0
+"access_stock_location_path_internal_user","stock location path internal user","model_stock_location_path","base.group_user",1,0,0,0
 "access_stock_location_path_manager","stock location path manager","model_stock_location_path","stock.group_stock_manager",1,1,1,1
 "access_stock_location_path_partner_manager","stock.location.path partner manager","model_stock_location_path","product.group_product_manager",1,1,1,1
 "access_stock_location_path_stock_user","stock.location.path stock user","model_stock_location_path","stock.group_stock_user",1,1,1,1
 "access_stock_location_path","stock.location.path","model_stock_location_path","base.group_sale_salesman",1,0,0,0
 "access_product_pulled_flow","product.pulled.flow","model_product_pulled_flow","base.group_sale_salesman",1,0,0,0
+"access_product_pulled_flow_internal","product.pulled.flow internal","model_product_pulled_flow","base.group_user",1,0,0,0
diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py
index 1f6d7b78e61..091054dbefb 100644
--- a/addons/stock_location/stock_location.py
+++ b/addons/stock_location/stock_location.py
@@ -65,8 +65,8 @@ class product_pulled_flow(osv.osv):
     _columns = {
         'name': fields.char('Name', size=64, required=True, help="This field will fill the packing Origin and the name of its moves"),
         'cancel_cascade': fields.boolean('Cancel Cascade', help="Allow you to cancel moves related to the product pull flow"),
-        'location_id': fields.many2one('stock.location','Location', required=True, help="Is the destination location that needs supplying"),
-        'location_src_id': fields.many2one('stock.location','Location Source', help="Location used by Destination Location to supply"),
+        'location_id': fields.many2one('stock.location','Destination Location', required=True, help="Is the destination location that needs supplying"),
+        'location_src_id': fields.many2one('stock.location','Source Location', help="Location used by Destination Location to supply"),
         'journal_id': fields.many2one('stock.journal','Journal'),
         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procure Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
         'type_proc': fields.selection([('produce','Produce'),('buy','Buy'),('move','Move')], 'Type of Procurement', required=True),
@@ -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_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index 24816e9fa1c..a90f4f81623 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -40,14 +40,14 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                    <page string="Logistics Flow">
+                    <page string="Logistics Flows">
                         <field name="flow_pull_ids" editable="bottom" colspan="4" nolabel="1">
                             <tree string="Pulled flows">
+                                <field name="name"/>
                                 <field name="location_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
                                 <field name="type_proc"/>
-                                <field name="name"/>
-                                <field name="company_id" groups="base.group_multi_company"/>
                                 <field name="journal_id" groups="base.group_extended"/>
+                                <field name="company_id" groups="base.group_multi_company"/>
                             </tree>
                             <form string="Pulled Paths">
                                 <separator string="Conditions" colspan="4"/>
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/de.po b/addons/stock_planning/i18n/de.po
index 52110f2832b..1f4c0892a66 100644
--- a/addons/stock_planning/i18n/de.po
+++ b/addons/stock_planning/i18n/de.po
@@ -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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_planning
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/fr.po b/addons/stock_planning/i18n/fr.po
index d80d2b2fd1c..a57e14a41fb 100644
--- a/addons/stock_planning/i18n/fr.po
+++ b/addons/stock_planning/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-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_planning
diff --git a/addons/stock_planning/i18n/hr.po b/addons/stock_planning/i18n/hr.po
index 071ea60d659..ac03caabfe9 100644
--- a/addons/stock_planning/i18n/hr.po
+++ b/addons/stock_planning/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:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-29 11:15+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_planning
@@ -53,16 +53,6 @@ msgstr "Period1 tvrtke"
 msgid "Group By..."
 msgstr "Grupiraj po..."
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Already Out: "
-msgstr ""
-"\n"
-" Već vani: "
-
 #. module: stock_planning
 #: help:stock.sale.forecast,product_amt:0
 msgid ""
@@ -72,11 +62,6 @@ msgstr ""
 "Vrijednost predviđanja koja će se promijeniti u količinu proizvoda u skladu "
 "s cijenama."
 
-#. module: stock_planning
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Pogrešan naziv u definiciji akcije."
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -153,6 +138,16 @@ msgstr "Kreiraj dnevne periode"
 msgid "Company"
 msgstr "Tvrtka"
 
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Initial Stock: "
+msgstr ""
+"\n"
+" Početna zaliha: "
+
 #. module: stock_planning
 #: help:stock.planning,warehouse_forecast:0
 msgid ""
@@ -202,16 +197,6 @@ msgstr ""
 msgid "Current Period Situation"
 msgstr "Stanje trenutnog perioda"
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Planned Out Before: "
-msgstr ""
-"\n"
-" Prethodno očekivani izlaz: "
-
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create Monthly Periods"
@@ -349,9 +334,10 @@ msgid "Procure Incoming Left"
 msgstr "Nabavi ostatak ulaza"
 
 #. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Zatvoreno"
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Incoming Left: "
+msgstr "    Ostatak ulaza: "
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -373,11 +359,6 @@ msgstr "Kreiraj"
 msgid "Master Procurement Schedule"
 msgstr "Raspored glavne nabave"
 
-#. module: stock_planning
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za arhitekturu View-a"
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -485,6 +466,16 @@ msgstr "Korisničko planiranje za "
 msgid "This User"
 msgstr "Ovaj korisnik"
 
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Confirmed Out: "
+msgstr ""
+"\n"
+" Potvrđen izlaz: "
+
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Forecasts"
@@ -539,22 +530,6 @@ msgstr "Morate odrediti početno skladište !"
 msgid "Creates planning lines for selected period and warehouse."
 msgstr "Kreira stavke planiranja za odabrani period i skladište."
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Warehouse Forecast: "
-msgstr ""
-"\n"
-" Predviđanje za skladište: "
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid "Cannot delete Validated Sale Forecasts !"
-msgstr "Ne možete izbrisati potvrđena predviđanja prodaje !"
-
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_user:0
 msgid "This User Period4"
@@ -592,6 +567,13 @@ msgstr ""
 msgid "Per User :"
 msgstr "Po korisniku :"
 
+#. 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 "Predviđanja prodaje:"
+
 #. module: stock_planning
 #: field:stock.period,name:0
 #: field:stock.period.createlines,name:0
@@ -604,9 +586,9 @@ msgid "Created/Validated by"
 msgstr "Kreirao/Potvrdio"
 
 #. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Predviđanje za skladište"
+#: view:stock.planning:0
+msgid "Internal Supply"
+msgstr "Unutarnja opskrba"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_company:0
@@ -618,16 +600,6 @@ msgstr "Period4 ove tvtke"
 msgid "This Company Period5"
 msgstr "Period5 ove tvtke"
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Planned Out: "
-msgstr ""
-"\n"
-" Očekivani izlaz: "
-
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_company:0
 msgid "This Company Period2"
@@ -669,6 +641,11 @@ msgstr ""
 msgid "Planned Out"
 msgstr "Očekivani izlaz"
 
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Department :"
+msgstr "Po odjelu:"
+
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Forecast"
@@ -682,9 +659,9 @@ msgid "Draft"
 msgstr "Nacrt"
 
 #. module: stock_planning
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Pogreška ! Ne možete kreirati rekurzivni izbornik."
+#: view:stock.period:0
+msgid "Closed"
+msgstr "Zatvoreno"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -693,9 +670,14 @@ msgid "Warehouse "
 msgstr "Skladište "
 
 #. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "Period5 ovog odjela"
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Expected Out: "
+msgstr ""
+"\n"
+" Očekivani izlaz: "
 
 #. module: stock_planning
 #: view:stock.period.createlines:0
@@ -715,15 +697,486 @@ msgstr ""
 "ili veća od Potvrđenog izlaza."
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid "    Incoming Left: "
-msgstr "    Ostatak ulaza: "
+#: 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 ""
+"\n"
+"Ovaj modul temelji se na originalnom OpenERP SA modulu stock_planning "
+"verzija 1.0 istog naziva kao i raspored glavne nabave.\n"
+"\n"
+"Svrha RGN je da se dopusti ručno kreiranje nabave (rekvizicije) odvojeno od "
+"RGN planera (koji automatski koristi pravila minimalne zalihe).\n"
+"\n"
+"Termini korišteni u modulu:\n"
+"- Period zalihe i prodaje - vrijeme (između datuma početka i završetka) za "
+"koje radite predviđanje zalihe i prodaje i plan nabave.\n"
+"- Predviđanje zalihe i prodaje - količina proizvoda za koju očekujete da "
+"ćete je prodati u odabranom periodu.\n"
+"- Planiranje zalihe - količina proizvoda koju planirate kupiti ili "
+"proizvesti u odabranom periodu.\n"
+"\n"
+"Pošto postoji modul module_sale_forecast koji koristi termine \"Predviđanje "
+"prodaje\" i \"Planiranje\" kao vrijednosti iznosa koristit ćemo izraze "
+"\"Predviđanje zalihe i prodaje\" i \"Planiranje zalihe\" da naglasimo da "
+"koristimo količine, a ne iznose. \n"
+"\n"
+"Aktivnosti u ovom modulu podijeljene su u tri koraka:\n"
+"- Kreiranje perioda. Obavezan korak.\n"
+"- Kreiranje predviđanja prodaje i unos količina u njih. Opcionalan korak, "
+"ali koristan za daljnje planiranje.\n"
+"- Kreiranje stavki planiranja, unos količina stavki i pokretanje nabave. "
+"Nabavljanje je konačan korak za period.\n"
+"\n"
+"Periodi\n"
+"=======\n"
+"Postoje dvije stavke izbornika za periode u \"Upravljanje prodajom - "
+"Podešavanje\". To su:\n"
+"- \"Kreiraj periode prodaje\" - automatizira kreiranje po dnevnim, tjednim "
+"ili mjesečnim periodima.\n"
+"- \"Periodi zalihe i prodaje\" - dozvoljava kreiranje bilo kojeg tipa "
+"perioda, promjene datuma i stanja perioda.\n"
+"\n"
+"Kreiranje perioda je prvi korak prema korištenju mogućnosti modula. Možete "
+"kreirati vlastite periode korištenjem gumba \"Novi\" na formi \"Periodi "
+"zalihe i prodaje\" ili u view-u, ali preporučavamo korištenje "
+"automatiziranog alata.\n"
+"\n"
+"Napomene:\n"
+"- Ovi periodi (službeno periodi zalihe i prodaje) su odvojeni od "
+"financijskih i ostalih perioda u sustavu.\n"
+"- Periodi nisu pridruženi tvrtkama (kada koristite svojstvo više tvrtki "
+"uopće). Modul pretpostavlja da koristite iste periode kroz različite tvrtke. "
+"Ako želite koristiti različite periode za različite tvrtke možete ih "
+"definirati kako želite (mogu se preklapati). Kasnije će se objasniti kako da "
+"se koriste takvi periodi.\n"
+"- Kada se automatski kreiraju periodi njihovi datumi početka i završetka "
+"počinju sa 00:00:00 i završavaju sa 23:59:00. Npr. kada kreirate dnevne "
+"periode imat će datum početka 31.01.2010 00:00:00 i datum završetka "
+"31.01.2010 23:59:00. Ovo funkcionira samo kod automatskog kreiranja perioda. "
+"Kada se periodi kreiraju ručno, potrebno je unijeti sate početka i završetka "
+"da ne bi došlo do pogrešnih vrijednosti na formama prodaje ili zalihe. \n"
+"- Ako koristite preklapajuće periode za isti proizvod, rezultati za "
+"skladište i tvrtku mogu biti nepredvidljivi.\n"
+"- Ako trenutni period ne pripada niti u jedan period ili imate praznine "
+"između perioda rezulatati mogu biti nepredvidljivi.\n"
+"\n"
+"Predviđanja prodaje\n"
+"===============\n"
+"Postoji nekoliko izbornika za predviđanje prodaje u \"Upravljanje prodajom - "
+"Predviđanja prodaje\".\n"
+"- \"Kreiraj predviđanja prodaje za periode prodaje\" - automatizira "
+"kreiranje stavki predviđanja prema korisničkim postavkama.\n"
+"- \"Predviđanja prodaje\" - nekoliko izbornika za rad s listama i formama "
+"predviđanja.\n"
+"\n"
+"Izbornik \"Kreiraj predviđanja prodaje za periode prodaje\" kreira "
+"predviđanja za proizvode iz odabrane kategorije, odabranog perioda i "
+"odabranog skladišta. To je mogućnost \"Kopiraj posljednje predviđanje\" za "
+"kopiranje predviđanja i ostalih postavki prethodnog perioda u kreirani.\n"
+"\n"
+"Napomene:\n"
+"- Ovaj alat ne kreira stavke, ako odgovarajuće stavke (za isti proizvod, "
+"period, skladište i potvrdili ste ih ili kreirali) već postoje. Ako želite "
+"kreirati novo predviđanje, ako odgovarajuće stavke postoje morate ih unijeti "
+"ručno korištenjem izbornika koji su opisani dolje.\n"
+"- Kada netko drugi potvrdi kreirane stavke možete koristiti ovaj alat za "
+"kreiranje drugih stavki za isti period, proizvod i skladište. \n"
+"- Kada odaberete \"Kopiraj posljednje predviđanje\" kreirana stavka uzima "
+"količinu i neke postavke iz vašeg (vi ste potvrdili ili kreirali ako još "
+"nije potvrđena) predviđanja iz prethodnog perioda prije perioda kreiranog "
+"predviđanja. Ako ste kreirali više predviđanja u prethodnom periodu (to je "
+"moguće) sustav uzima jedno od njih (ne postoji pravilo koje).\n"
+"\n"
+"\n"
+"Izbornik \"Predviđanja prodaje\"\n"
+"Na formi \"Predviđanje prodaje\" uglavnom morate unijeti predviđenu količinu "
+"u polje \"Količina proizvoda\". Daljnje kalkulacije mogu se izvesti za "
+"nacrte predviđanja. Ali potvrđivanje snima vaše podatke da se spriječe "
+"slučajne promjene. Možete kliknuti na gumb \"Potvrdi\" ali nije obvezno.\n"
+"\n"
+"Umjesto predviđene količine  možete unijeti iznos predviđanja prodaje u "
+"polje \"Iznos prodaje\". Sustav će odrediti količinu prema prodajnoj cijeni "
+"proizvoda.\n"
+"\n"
+"Sve vrijednosti na formi su izražene u jedinici mjere odabranoj na formi. "
+"Možete odabrati jedinicu mjere iz predefinirane kategorije ili iz neke druge "
+"kategorije. Kada promijenite jedinicu mjere količine će se preračunati prema "
+"novoj JM: promjenjiva polja (plava) odmah, a nepromjenjiva polja nakon klika "
+"na gumb \"Napravi plan\" .\n"
+"\n"
+"Za određivanje ispravne vrijednosti za predviđanje prodaje možete koristiti "
+"\"Povijest prodaje\" tablicu za ovaj proizvod. Morate unijeti parametre u "
+"gornji i lijevi dio tablice i sustav će izračunati prodane količine prema "
+"tim parametrima. Tako možete npr. odabrati svoj odjel (na vrhu) onda "
+"(lijevo): posljednji period, period koji je prethodio posljednjem i period "
+"prije godinu dana.\n"
+"\n"
+"Napomene:\n"
+"\n"
+"\n"
+"Plan nabave\n"
+"====================\n"
+"Izbornik za planiranje nalazi se u \"Skladište - Planiranje zalihe\".\n"
+"- \"Kreiraj stavke planiranja zalihe\" - automatizira kreiranje stavki "
+"planiranja prema parametrima.\n"
+"- \"Raspored glavne nabave\" - najvažniji izbornik modula koji dozvoljava "
+"kreiranje nabave.\n"
+"\n"
+"Predviđanje prodaje je faza planiranja prodaje. Plan nabave (Planiranje) je "
+"faza automatiziranja kupovine ili proizvodnje. Možete kreirati plan nabave "
+"brzo korištenjem alata iz izbornika \"Kreiraj stavke planiranja zalihe\", "
+"onda možete pregledati kreirani plan i započeti nabavu korištenjem izbornika "
+"\"Raspored glavne nabave\".\n"
+"\n"
+"Izbornik \"Kreiraj stavke planiranja zalihe\" dozvoljava brzo kreiranje "
+"stavki planiranja iz odabrane kategorije, za odabrani period i odabrano "
+"skladište. Kada odaberete \"Svi proizvodi sa predviđanjem\" sustav kreria "
+"stavke za sve proizvode sa predviđanjem za odabrani period i skladište. "
+"Odabrana kategorija se tada ignorira.\n"
+"\n"
+"Pod izbornikom \"Raspored glavne nabave\" možete mijenjati vrijednosti polja "
+"\"Očekivani izlaz\" i \"Očekivani ulaz\" provjeravati polje \"Simulacija "
+"zalihe\" i odlučiti hoće li ova vrijednost biti točna za kraj perioda. \n"
+"\"Očekivani izlaz\" može se temeljiti na polju \"Predviđanje skladišta\" "
+"koje je suma svih predviđanja za period i skladište. Vaše planiranje može "
+"biti temeljeno i na nekoj drugoj informaciji koju imate. Nije nužno imati "
+"predviđanje. \n"
+"\"Očekivani ulaz\" količina se koristi za izračun polja \"Ostatak ulaza\" "
+"što predstavlja količinu koju je potrebno nabaviti za zalihu kao što "
+"pokazuje vrijednost polja \"Simulacija zalihe\" na kraju perioda. Možete "
+"usporediti vrijednost polja \"Simulacija zalihe\" sa pravilima minimalne "
+"zalihe vidljivima na formi. Ali možete planirati količinu drukčiju od "
+"količine u pravilima minimalne količine. Kalkulacija se prema osnovnim "
+"postavkama radi za cijelo skladište. Ako želite vidjeti vrijednosti lokacije "
+"zalihe skladišta možete označiti kućicu \"Samo lokacija zalihe\".\n"
+"\n"
+"Ako ste nakon nekoliko pokušaja odredili ispravne količine za \"Očekivani "
+"izlaz\" i \"Očekivani ulaz\" i zadovoljni ste sa zalihom kraja perioda "
+"izračunatom u polju \"Simulacija zalihe\" možete kliknuti na gumb \"Nabavi "
+"ostatak ulaza\" za nabavu količina polja \"Ostatak ulaza\" u skladište. "
+"Sustav kreira odgovarajuće dokumente nabave. Možete odabrati hoće li se "
+"nabava vršiti na zalihu ili na ulaznu lokaciju odabranog skladišta. \n"
+"\n"
+"Ako ne želite proizvesti ili kupiti proizvodm samo odaberite potrebnu "
+"količinu iz drugog skladišta i kliknite na gumb \"Prebaci iz drugog "
+"skladišta\" (umjesto gumba \"Nabavi ostatak ulaza\"). Sustav kreira listu "
+"proizvoda sa prijenosom iz odabranog izvorišnog skladišta na skladište na "
+"kojem se vrši izračun (kao odredište).  Možete odlučiti hoće li se lista "
+"proizvoda raditi sa zalihe ili izlazne lokacije izvorišnog skladišta. "
+"Odredišna lokacija (zaliha ili ulaz) odredišnog skladišta koristit će se za "
+"akciju \"Nabavi ostatak ulaza\".\n"
+"\n"
+"Klikom na gumb \"Napravi plan\" prikazuju se valjane vrijednosti polja "
+"\"Potvrđeni ulaz\", \"Potvrđeni izlaz\", \"Potvrđen ulaz prije\", \"Potvrđen "
+"izlaz prije\" i \"Simulacija zalihe\".\n"
+"\n"
+"Sve vrijednosti na formi su izražene u jedinici mjere odabranoj na formi. "
+"Možete odabrati jedinicu mjere iz predefinirane kategorije ili iz neke druge "
+"kategorije. Kada promijenite jedinicu mjere količine će se preračunati prema "
+"novoj JM: promjenjiva polja (plava) odmah, a nepromjenjiva polja nakon klika "
+"na gumb \"Napravi plan\" .\n"
+"\n"
+"\n"
+"Simulacija zalihe računa se na sljedeći način:\n"
+"Općenito simulacija zalihe prikazuje zalihu za kraj perioda kalkulacije "
+"prema planiranim ili potvrđenim prijenosima zalihe. Kalkulacija uvijek "
+"započinje sa količinom realne zalihe na početku trenutnog perioda. Zatim "
+"kalkulacija dodaje ili oduzima količine perioda kalkulacije ili perioda "
+"prije kalkulacije.\n"
+"Kada se radi o istom periodu (trenutni period je isti kao period "
+"kalkulacije) simulacija zalihe izračunava se na sljedeći način:\n"
+"Simulacija zalihe = \n"
+"\tPočetna zaliha trenutnog perioda\n"
+"\t- Očekivani izlaz \n"
+"\t+Očekivani ulaz \n"
+"\n"
+"Kada računate sljedeći period:\n"
+"Simulacija zalihe = \n"
+"\tPočetna zaliha trenutnog perioda\n"
+"\t- Očekivani izlaz trenutnog perioda \n"
+"\t+Potvrđen ulaz trenutnog perioda (uključujući već postojeće količine)\t- "
+"Očekivani izlaz perioda kalkulacije \n"
+"\t+Očekivani ulaz perioda kalkulacije \n"
+"\n"
+"Period kalkulacije se uzima na sličan način kao u slučaju gore. Kalkulacije "
+"trenutnog perioda se rade malo drukčije.Prvo primijetite da sustav za "
+"trenutni period uzima samo potvrđene ulaze. To znači da morate napraviti "
+"planiranje i nabavu za trenutni period prije ove kalkulacije (za sljedeći "
+"period). \n"
+"\n"
+"Kad računate sljedeći period:\n"
+"Simulacija zalihe = \n"
+"\tPočetna zaliha trenutnog perioda\n"
+"\t- suma očekivanih izlaza perioda prije perioda kalkulacije \n"
+"\t+ suma očekivanih ulaza perioda prije perioda kalkulacije (uključujući već "
+"postojeće količine) \n"
+"\t- Očekivani izlaz perioda kalkulacije \n"
+"\t+Očekivani ulaz perioda kalkulacije \n"
+"\n"
+"Periodi prije perioda kalkulacije označavaju periode od trenutnog do perioda "
+"kalkulacije.\n"
+"\n"
+"Napomene:\n"
+"- Sjetite se da obavite planiranje za sve periode prije kalkulacija jer "
+"nedostatak ovih količina i kreiranih nabava može prouzročiti krive "
+"prijedloge za nabavu za periode koji slijede.\n"
+"- Ako ste obavili planiranje za nekoliko perioda unaprijed i ustanovite da "
+"je Potvrđeni izlaz veći od Očekivanog izlaza u nekim periodima prije možete "
+"ponoviti planiranje i napraviti drugu nabavu. Trebali bi to napraviti u "
+"istoj stavci planiranja. Ako kreirate drugu stavku planiranja prijedlozi "
+"mogu biti neispravni.\n"
+"- Kada želite raditi sa različitim periodima za jedan dio proizvoda odredite "
+"dvije vrste perioda (npr. tjedni i mjesečni) i koristite ih za različite "
+"proizvode. Primjer: Ako uvijek koristite tjedne periode za proizvod A, i "
+"mjesečne periode za proizvod B sve kalkulacije će biti ispravne. Također "
+"možete koristiti različite vrste perioda za iste proizvode iz različitih "
+"skladišta ili tvrtki. Ali ne možete koristiti periode koji se preklapaju za "
+"isti proizvod, skladište i tvrtku jer rezultati mogu biti nepredvidljivi. "
+"Isto se odnosi na stavke predviđanja.\n"
 
 #. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Unutarnja opskrba"
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Cannot delete Validated Sale Forecasts !"
+msgstr "Ne možete izbrisati potvrđena predviđanja prodaje !"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Planned Out: "
+msgstr ""
+"\n"
+" Očekivani izlaz: "
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -789,16 +1242,6 @@ msgstr "Period3"
 msgid "Period1"
 msgstr "Period1"
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Initial Stock: "
-msgstr ""
-"\n"
-" Početna zaliha: "
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -838,6 +1281,11 @@ msgstr "Planiranje i situacija za izračunati period"
 msgid "This Warehouse Period1"
 msgstr "Period1 ovog skladišta"
 
+#. module: stock_planning
+#: field:stock.planning,warehouse_forecast:0
+msgid "Warehouse Forecast"
+msgstr "Predviđanje za skladište"
+
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -864,26 +1312,6 @@ msgstr "Predviđena količina."
 msgid "Stock"
 msgstr "Zaliha"
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Stock Simulation: "
-msgstr ""
-"\n"
-" Simulacija zalihe: "
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Confirmed Out: "
-msgstr ""
-"\n"
-" Potvrđen izlaz: "
-
 #. module: stock_planning
 #: field:stock.planning,stock_supply_location:0
 msgid "Stock Supply Location"
@@ -1008,11 +1436,9 @@ msgid "This Dept Period2"
 msgstr "Period2 ovog odjela"
 
 #. module: stock_planning
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta mora počinjati sa x_ i ne smije sadržavati posebne znakove !"
+#: field:stock.sale.forecast,analyzed_period5_per_dept:0
+msgid "This Dept Period5"
+msgstr "Period5 ovog odjela"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_dept:0
@@ -1080,9 +1506,14 @@ msgid "Warehouse which planning will concern."
 msgstr "Skladište na koje se odnosi planiranje."
 
 #. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Po tvrtki:"
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Stock Simulation: "
+msgstr ""
+"\n"
+" Simulacija zalihe: "
 
 #. module: stock_planning
 #: help:stock.planning,to_procure:0
@@ -1120,10 +1551,10 @@ msgstr "Po skladištu:"
 #, python-format
 msgid ""
 "\n"
-"For period: "
+" Warehouse Forecast: "
 msgstr ""
 "\n"
-"Za period: "
+" Predviđanje za skladište: "
 
 #. module: stock_planning
 #: field:stock.planning,history:0
@@ -1142,9 +1573,21 @@ msgid "    Planned In: "
 msgstr "    Očekivan ulaz: "
 
 #. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Po odjelu:"
+#: field:stock.sale.forecast,analyze_company:0
+msgid "Per Company"
+msgstr "Po tvrtki:"
+
+#. 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 ""
+"Preostala količina za planiranu ulaznu količinu. Ovo je izračunata "
+"vrijednost između planiranog i potvrđenog ulaza. Za trenutni period trenutni "
+"ulaz je već izbračunat. Ova vrijednost se koristi za kreiranje nabave za "
+"manjak količina."
 
 #. module: stock_planning
 #: help:stock.planning,incoming:0
@@ -1208,17 +1651,10 @@ msgstr "Proizvod"
 #, python-format
 msgid ""
 "\n"
-" Expected Out: "
+"For period: "
 msgstr ""
 "\n"
-" Očekivani izlaz: "
-
-#. 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 "Predviđanja prodaje:"
+"Za period: "
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_uom:0
@@ -1304,482 +1740,38 @@ msgid "Shows who created this forecast, or who validated."
 msgstr "Pokazuje tko je kreirao ovo predviđanje, ili tko ga je potvrdio."
 
 #. module: stock_planning
-#: help:stock.planning,incoming_left:0
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
 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."
+"\n"
+" Planned Out Before: "
 msgstr ""
-"Preostala količina za planiranu ulaznu količinu. Ovo je izračunata "
-"vrijednost između planiranog i potvrđenog ulaza. Za trenutni period trenutni "
-"ulaz je već izbračunat. Ova vrijednost se koristi za kreiranje nabave za "
-"manjak količina."
+"\n"
+" Prethodno očekivani izlaz: "
 
 #. module: stock_planning
 #: field:stock.planning,stock_start:0
 msgid "Initial Stock"
 msgstr "Početna zaliha"
 
+#, python-format
 #~ 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"
+#~ " Already Out: "
 #~ msgstr ""
 #~ "\n"
-#~ "Ovaj modul temelji se na originalnom OpenERP SA modulu stock_planning "
-#~ "verzija 1.0 istog naziva kao i raspored glavne nabave.\n"
-#~ "\n"
-#~ "Svrha RGN je da se dopusti ručno kreiranje nabave (rekvizicije) odvojeno od "
-#~ "RGN planera (koji automatski koristi pravila minimalne zalihe).\n"
-#~ "\n"
-#~ "Termini korišteni u modulu:\n"
-#~ "- Period zalihe i prodaje - vrijeme (između datuma početka i završetka) za "
-#~ "koje radite predviđanje zalihe i prodaje i plan nabave.\n"
-#~ "- Predviđanje zalihe i prodaje - količina proizvoda za koju očekujete da "
-#~ "ćete je prodati u odabranom periodu.\n"
-#~ "- Planiranje zalihe - količina proizvoda koju planirate kupiti ili "
-#~ "proizvesti u odabranom periodu.\n"
-#~ "\n"
-#~ "Pošto postoji modul module_sale_forecast koji koristi termine \"Predviđanje "
-#~ "prodaje\" i \"Planiranje\" kao vrijednosti iznosa koristit ćemo izraze "
-#~ "\"Predviđanje zalihe i prodaje\" i \"Planiranje zalihe\" da naglasimo da "
-#~ "koristimo količine, a ne iznose. \n"
-#~ "\n"
-#~ "Aktivnosti u ovom modulu podijeljene su u tri koraka:\n"
-#~ "- Kreiranje perioda. Obavezan korak.\n"
-#~ "- Kreiranje predviđanja prodaje i unos količina u njih. Opcionalan korak, "
-#~ "ali koristan za daljnje planiranje.\n"
-#~ "- Kreiranje stavki planiranja, unos količina stavki i pokretanje nabave. "
-#~ "Nabavljanje je konačan korak za period.\n"
-#~ "\n"
-#~ "Periodi\n"
-#~ "=======\n"
-#~ "Postoje dvije stavke izbornika za periode u \"Upravljanje prodajom - "
-#~ "Podešavanje\". To su:\n"
-#~ "- \"Kreiraj periode prodaje\" - automatizira kreiranje po dnevnim, tjednim "
-#~ "ili mjesečnim periodima.\n"
-#~ "- \"Periodi zalihe i prodaje\" - dozvoljava kreiranje bilo kojeg tipa "
-#~ "perioda, promjene datuma i stanja perioda.\n"
-#~ "\n"
-#~ "Kreiranje perioda je prvi korak prema korištenju mogućnosti modula. Možete "
-#~ "kreirati vlastite periode korištenjem gumba \"Novi\" na formi \"Periodi "
-#~ "zalihe i prodaje\" ili u view-u, ali preporučavamo korištenje "
-#~ "automatiziranog alata.\n"
-#~ "\n"
-#~ "Napomene:\n"
-#~ "- Ovi periodi (službeno periodi zalihe i prodaje) su odvojeni od "
-#~ "financijskih i ostalih perioda u sustavu.\n"
-#~ "- Periodi nisu pridruženi tvrtkama (kada koristite svojstvo više tvrtki "
-#~ "uopće). Modul pretpostavlja da koristite iste periode kroz različite tvrtke. "
-#~ "Ako želite koristiti različite periode za različite tvrtke možete ih "
-#~ "definirati kako želite (mogu se preklapati). Kasnije će se objasniti kako da "
-#~ "se koriste takvi periodi.\n"
-#~ "- Kada se automatski kreiraju periodi njihovi datumi početka i završetka "
-#~ "počinju sa 00:00:00 i završavaju sa 23:59:00. Npr. kada kreirate dnevne "
-#~ "periode imat će datum početka 31.01.2010 00:00:00 i datum završetka "
-#~ "31.01.2010 23:59:00. Ovo funkcionira samo kod automatskog kreiranja perioda. "
-#~ "Kada se periodi kreiraju ručno, potrebno je unijeti sate početka i završetka "
-#~ "da ne bi došlo do pogrešnih vrijednosti na formama prodaje ili zalihe. \n"
-#~ "- Ako koristite preklapajuće periode za isti proizvod, rezultati za "
-#~ "skladište i tvrtku mogu biti nepredvidljivi.\n"
-#~ "- Ako trenutni period ne pripada niti u jedan period ili imate praznine "
-#~ "između perioda rezulatati mogu biti nepredvidljivi.\n"
-#~ "\n"
-#~ "Predviđanja prodaje\n"
-#~ "===============\n"
-#~ "Postoji nekoliko izbornika za predviđanje prodaje u \"Upravljanje prodajom - "
-#~ "Predviđanja prodaje\".\n"
-#~ "- \"Kreiraj predviđanja prodaje za periode prodaje\" - automatizira "
-#~ "kreiranje stavki predviđanja prema korisničkim postavkama.\n"
-#~ "- \"Predviđanja prodaje\" - nekoliko izbornika za rad s listama i formama "
-#~ "predviđanja.\n"
-#~ "\n"
-#~ "Izbornik \"Kreiraj predviđanja prodaje za periode prodaje\" kreira "
-#~ "predviđanja za proizvode iz odabrane kategorije, odabranog perioda i "
-#~ "odabranog skladišta. To je mogućnost \"Kopiraj posljednje predviđanje\" za "
-#~ "kopiranje predviđanja i ostalih postavki prethodnog perioda u kreirani.\n"
-#~ "\n"
-#~ "Napomene:\n"
-#~ "- Ovaj alat ne kreira stavke, ako odgovarajuće stavke (za isti proizvod, "
-#~ "period, skladište i potvrdili ste ih ili kreirali) već postoje. Ako želite "
-#~ "kreirati novo predviđanje, ako odgovarajuće stavke postoje morate ih unijeti "
-#~ "ručno korištenjem izbornika koji su opisani dolje.\n"
-#~ "- Kada netko drugi potvrdi kreirane stavke možete koristiti ovaj alat za "
-#~ "kreiranje drugih stavki za isti period, proizvod i skladište. \n"
-#~ "- Kada odaberete \"Kopiraj posljednje predviđanje\" kreirana stavka uzima "
-#~ "količinu i neke postavke iz vašeg (vi ste potvrdili ili kreirali ako još "
-#~ "nije potvrđena) predviđanja iz prethodnog perioda prije perioda kreiranog "
-#~ "predviđanja. Ako ste kreirali više predviđanja u prethodnom periodu (to je "
-#~ "moguće) sustav uzima jedno od njih (ne postoji pravilo koje).\n"
-#~ "\n"
-#~ "\n"
-#~ "Izbornik \"Predviđanja prodaje\"\n"
-#~ "Na formi \"Predviđanje prodaje\" uglavnom morate unijeti predviđenu količinu "
-#~ "u polje \"Količina proizvoda\". Daljnje kalkulacije mogu se izvesti za "
-#~ "nacrte predviđanja. Ali potvrđivanje snima vaše podatke da se spriječe "
-#~ "slučajne promjene. Možete kliknuti na gumb \"Potvrdi\" ali nije obvezno.\n"
-#~ "\n"
-#~ "Umjesto predviđene količine  možete unijeti iznos predviđanja prodaje u "
-#~ "polje \"Iznos prodaje\". Sustav će odrediti količinu prema prodajnoj cijeni "
-#~ "proizvoda.\n"
-#~ "\n"
-#~ "Sve vrijednosti na formi su izražene u jedinici mjere odabranoj na formi. "
-#~ "Možete odabrati jedinicu mjere iz predefinirane kategorije ili iz neke druge "
-#~ "kategorije. Kada promijenite jedinicu mjere količine će se preračunati prema "
-#~ "novoj JM: promjenjiva polja (plava) odmah, a nepromjenjiva polja nakon klika "
-#~ "na gumb \"Napravi plan\" .\n"
-#~ "\n"
-#~ "Za određivanje ispravne vrijednosti za predviđanje prodaje možete koristiti "
-#~ "\"Povijest prodaje\" tablicu za ovaj proizvod. Morate unijeti parametre u "
-#~ "gornji i lijevi dio tablice i sustav će izračunati prodane količine prema "
-#~ "tim parametrima. Tako možete npr. odabrati svoj odjel (na vrhu) onda "
-#~ "(lijevo): posljednji period, period koji je prethodio posljednjem i period "
-#~ "prije godinu dana.\n"
-#~ "\n"
-#~ "Napomene:\n"
-#~ "\n"
-#~ "\n"
-#~ "Plan nabave\n"
-#~ "====================\n"
-#~ "Izbornik za planiranje nalazi se u \"Skladište - Planiranje zalihe\".\n"
-#~ "- \"Kreiraj stavke planiranja zalihe\" - automatizira kreiranje stavki "
-#~ "planiranja prema parametrima.\n"
-#~ "- \"Raspored glavne nabave\" - najvažniji izbornik modula koji dozvoljava "
-#~ "kreiranje nabave.\n"
-#~ "\n"
-#~ "Predviđanje prodaje je faza planiranja prodaje. Plan nabave (Planiranje) je "
-#~ "faza automatiziranja kupovine ili proizvodnje. Možete kreirati plan nabave "
-#~ "brzo korištenjem alata iz izbornika \"Kreiraj stavke planiranja zalihe\", "
-#~ "onda možete pregledati kreirani plan i započeti nabavu korištenjem izbornika "
-#~ "\"Raspored glavne nabave\".\n"
-#~ "\n"
-#~ "Izbornik \"Kreiraj stavke planiranja zalihe\" dozvoljava brzo kreiranje "
-#~ "stavki planiranja iz odabrane kategorije, za odabrani period i odabrano "
-#~ "skladište. Kada odaberete \"Svi proizvodi sa predviđanjem\" sustav kreria "
-#~ "stavke za sve proizvode sa predviđanjem za odabrani period i skladište. "
-#~ "Odabrana kategorija se tada ignorira.\n"
-#~ "\n"
-#~ "Pod izbornikom \"Raspored glavne nabave\" možete mijenjati vrijednosti polja "
-#~ "\"Očekivani izlaz\" i \"Očekivani ulaz\" provjeravati polje \"Simulacija "
-#~ "zalihe\" i odlučiti hoće li ova vrijednost biti točna za kraj perioda. \n"
-#~ "\"Očekivani izlaz\" može se temeljiti na polju \"Predviđanje skladišta\" "
-#~ "koje je suma svih predviđanja za period i skladište. Vaše planiranje može "
-#~ "biti temeljeno i na nekoj drugoj informaciji koju imate. Nije nužno imati "
-#~ "predviđanje. \n"
-#~ "\"Očekivani ulaz\" količina se koristi za izračun polja \"Ostatak ulaza\" "
-#~ "što predstavlja količinu koju je potrebno nabaviti za zalihu kao što "
-#~ "pokazuje vrijednost polja \"Simulacija zalihe\" na kraju perioda. Možete "
-#~ "usporediti vrijednost polja \"Simulacija zalihe\" sa pravilima minimalne "
-#~ "zalihe vidljivima na formi. Ali možete planirati količinu drukčiju od "
-#~ "količine u pravilima minimalne količine. Kalkulacija se prema osnovnim "
-#~ "postavkama radi za cijelo skladište. Ako želite vidjeti vrijednosti lokacije "
-#~ "zalihe skladišta možete označiti kućicu \"Samo lokacija zalihe\".\n"
-#~ "\n"
-#~ "Ako ste nakon nekoliko pokušaja odredili ispravne količine za \"Očekivani "
-#~ "izlaz\" i \"Očekivani ulaz\" i zadovoljni ste sa zalihom kraja perioda "
-#~ "izračunatom u polju \"Simulacija zalihe\" možete kliknuti na gumb \"Nabavi "
-#~ "ostatak ulaza\" za nabavu količina polja \"Ostatak ulaza\" u skladište. "
-#~ "Sustav kreira odgovarajuće dokumente nabave. Možete odabrati hoće li se "
-#~ "nabava vršiti na zalihu ili na ulaznu lokaciju odabranog skladišta. \n"
-#~ "\n"
-#~ "Ako ne želite proizvesti ili kupiti proizvodm samo odaberite potrebnu "
-#~ "količinu iz drugog skladišta i kliknite na gumb \"Prebaci iz drugog "
-#~ "skladišta\" (umjesto gumba \"Nabavi ostatak ulaza\"). Sustav kreira listu "
-#~ "proizvoda sa prijenosom iz odabranog izvorišnog skladišta na skladište na "
-#~ "kojem se vrši izračun (kao odredište).  Možete odlučiti hoće li se lista "
-#~ "proizvoda raditi sa zalihe ili izlazne lokacije izvorišnog skladišta. "
-#~ "Odredišna lokacija (zaliha ili ulaz) odredišnog skladišta koristit će se za "
-#~ "akciju \"Nabavi ostatak ulaza\".\n"
-#~ "\n"
-#~ "Klikom na gumb \"Napravi plan\" prikazuju se valjane vrijednosti polja "
-#~ "\"Potvrđeni ulaz\", \"Potvrđeni izlaz\", \"Potvrđen ulaz prije\", \"Potvrđen "
-#~ "izlaz prije\" i \"Simulacija zalihe\".\n"
-#~ "\n"
-#~ "Sve vrijednosti na formi su izražene u jedinici mjere odabranoj na formi. "
-#~ "Možete odabrati jedinicu mjere iz predefinirane kategorije ili iz neke druge "
-#~ "kategorije. Kada promijenite jedinicu mjere količine će se preračunati prema "
-#~ "novoj JM: promjenjiva polja (plava) odmah, a nepromjenjiva polja nakon klika "
-#~ "na gumb \"Napravi plan\" .\n"
-#~ "\n"
-#~ "\n"
-#~ "Simulacija zalihe računa se na sljedeći način:\n"
-#~ "Općenito simulacija zalihe prikazuje zalihu za kraj perioda kalkulacije "
-#~ "prema planiranim ili potvrđenim prijenosima zalihe. Kalkulacija uvijek "
-#~ "započinje sa količinom realne zalihe na početku trenutnog perioda. Zatim "
-#~ "kalkulacija dodaje ili oduzima količine perioda kalkulacije ili perioda "
-#~ "prije kalkulacije.\n"
-#~ "Kada se radi o istom periodu (trenutni period je isti kao period "
-#~ "kalkulacije) simulacija zalihe izračunava se na sljedeći način:\n"
-#~ "Simulacija zalihe = \n"
-#~ "\tPočetna zaliha trenutnog perioda\n"
-#~ "\t- Očekivani izlaz \n"
-#~ "\t+Očekivani ulaz \n"
-#~ "\n"
-#~ "Kada računate sljedeći period:\n"
-#~ "Simulacija zalihe = \n"
-#~ "\tPočetna zaliha trenutnog perioda\n"
-#~ "\t- Očekivani izlaz trenutnog perioda \n"
-#~ "\t+Potvrđen ulaz trenutnog perioda (uključujući već postojeće količine)\t- "
-#~ "Očekivani izlaz perioda kalkulacije \n"
-#~ "\t+Očekivani ulaz perioda kalkulacije \n"
-#~ "\n"
-#~ "Period kalkulacije se uzima na sličan način kao u slučaju gore. Kalkulacije "
-#~ "trenutnog perioda se rade malo drukčije.Prvo primijetite da sustav za "
-#~ "trenutni period uzima samo potvrđene ulaze. To znači da morate napraviti "
-#~ "planiranje i nabavu za trenutni period prije ove kalkulacije (za sljedeći "
-#~ "period). \n"
-#~ "\n"
-#~ "Kad računate sljedeći period:\n"
-#~ "Simulacija zalihe = \n"
-#~ "\tPočetna zaliha trenutnog perioda\n"
-#~ "\t- suma očekivanih izlaza perioda prije perioda kalkulacije \n"
-#~ "\t+ suma očekivanih ulaza perioda prije perioda kalkulacije (uključujući već "
-#~ "postojeće količine) \n"
-#~ "\t- Očekivani izlaz perioda kalkulacije \n"
-#~ "\t+Očekivani ulaz perioda kalkulacije \n"
-#~ "\n"
-#~ "Periodi prije perioda kalkulacije označavaju periode od trenutnog do perioda "
-#~ "kalkulacije.\n"
-#~ "\n"
-#~ "Napomene:\n"
-#~ "- Sjetite se da obavite planiranje za sve periode prije kalkulacija jer "
-#~ "nedostatak ovih količina i kreiranih nabava može prouzročiti krive "
-#~ "prijedloge za nabavu za periode koji slijede.\n"
-#~ "- Ako ste obavili planiranje za nekoliko perioda unaprijed i ustanovite da "
-#~ "je Potvrđeni izlaz veći od Očekivanog izlaza u nekim periodima prije možete "
-#~ "ponoviti planiranje i napraviti drugu nabavu. Trebali bi to napraviti u "
-#~ "istoj stavci planiranja. Ako kreirate drugu stavku planiranja prijedlozi "
-#~ "mogu biti neispravni.\n"
-#~ "- Kada želite raditi sa različitim periodima za jedan dio proizvoda odredite "
-#~ "dvije vrste perioda (npr. tjedni i mjesečni) i koristite ih za različite "
-#~ "proizvode. Primjer: Ako uvijek koristite tjedne periode za proizvod A, i "
-#~ "mjesečne periode za proizvod B sve kalkulacije će biti ispravne. Također "
-#~ "možete koristiti različite vrste perioda za iste proizvode iz različitih "
-#~ "skladišta ili tvrtki. Ali ne možete koristiti periode koji se preklapaju za "
-#~ "isti proizvod, skladište i tvrtku jer rezultati mogu biti nepredvidljivi. "
-#~ "Isto se odnosi na stavke predviđanja.\n"
+#~ " Već vani: "
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Pogrešan naziv u definiciji akcije."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nevažeći XML za arhitekturu View-a"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Pogreška ! Ne možete kreirati rekurzivni izbornik."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta mora počinjati sa x_ i ne smije sadržavati posebne znakove !"
diff --git a/addons/stock_planning/i18n/mn.po b/addons/stock_planning/i18n/mn.po
index eb8f00f7728..19090c21144 100644
--- a/addons/stock_planning/i18n/mn.po
+++ b/addons/stock_planning/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:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-29 11:29+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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_planning
@@ -48,14 +48,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Бүлэглэх..."
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Already Out: "
-msgstr ""
-
 #. module: stock_planning
 #: help:stock.sale.forecast,product_amt:0
 msgid ""
@@ -63,11 +55,6 @@ msgid ""
 "prices."
 msgstr ""
 
-#. module: stock_planning
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -139,6 +126,14 @@ msgstr ""
 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 ""
@@ -184,14 +179,6 @@ msgstr ""
 msgid "Current Period Situation"
 msgstr ""
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Planned Out Before: "
-msgstr ""
-
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create Monthly Periods"
@@ -323,8 +310,9 @@ msgid "Procure Incoming Left"
 msgstr ""
 
 #. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Incoming Left: "
 msgstr ""
 
 #. module: stock_planning
@@ -347,11 +335,6 @@ msgstr ""
 msgid "Master Procurement Schedule"
 msgstr ""
 
-#. module: stock_planning
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -453,6 +436,14 @@ msgstr ""
 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"
@@ -506,20 +497,6 @@ msgstr ""
 msgid "Creates planning lines for selected period and warehouse."
 msgstr ""
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Warehouse Forecast: "
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid "Cannot delete Validated Sale Forecasts !"
-msgstr ""
-
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_user:0
 msgid "This User Period4"
@@ -554,6 +531,13 @@ msgstr ""
 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
@@ -566,8 +550,8 @@ msgid "Created/Validated by"
 msgstr ""
 
 #. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
+#: view:stock.planning:0
+msgid "Internal Supply"
 msgstr ""
 
 #. module: stock_planning
@@ -580,14 +564,6 @@ msgstr ""
 msgid "This Company Period5"
 msgstr ""
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Planned Out: "
-msgstr ""
-
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_company:0
 msgid "This Company Period2"
@@ -626,6 +602,11 @@ msgstr ""
 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"
@@ -639,8 +620,8 @@ msgid "Draft"
 msgstr ""
 
 #. module: stock_planning
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:stock.period:0
+msgid "Closed"
 msgstr ""
 
 #. module: stock_planning
@@ -650,8 +631,11 @@ msgid "Warehouse "
 msgstr ""
 
 #. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Expected Out: "
 msgstr ""
 
 #. module: stock_planning
@@ -668,14 +652,250 @@ msgid ""
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid "    Incoming Left: "
+#: 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
-#: view:stock.planning:0
-msgid "Internal Supply"
+#: 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
@@ -737,14 +957,6 @@ msgstr ""
 msgid "Period1"
 msgstr ""
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Initial Stock: "
-msgstr ""
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -784,6 +996,11 @@ msgstr ""
 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
@@ -810,22 +1027,6 @@ msgstr ""
 msgid "Stock"
 msgstr ""
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Stock Simulation: "
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Confirmed Out: "
-msgstr ""
-
 #. module: stock_planning
 #: field:stock.planning,stock_supply_location:0
 msgid "Stock Supply Location"
@@ -947,9 +1148,8 @@ msgid "This Dept Period2"
 msgstr ""
 
 #. module: stock_planning
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:stock.sale.forecast,analyzed_period5_per_dept:0
+msgid "This Dept Period5"
 msgstr ""
 
 #. module: stock_planning
@@ -1015,8 +1215,11 @@ msgid "Warehouse which planning will concern."
 msgstr ""
 
 #. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Stock Simulation: "
 msgstr ""
 
 #. module: stock_planning
@@ -1052,7 +1255,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"For period: "
+" Warehouse Forecast: "
 msgstr ""
 
 #. module: stock_planning
@@ -1072,8 +1275,16 @@ msgid "    Planned In: "
 msgstr ""
 
 #. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
+#: 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
@@ -1133,14 +1344,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-" Expected Out: "
-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"
+"For period: "
 msgstr ""
 
 #. module: stock_planning
@@ -1224,14 +1428,17 @@ msgid "Shows who created this forecast, or who validated."
 msgstr ""
 
 #. module: stock_planning
-#: help:stock.planning,incoming_left:0
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
 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."
+"\n"
+" Planned Out Before: "
 msgstr ""
 
 #. module: stock_planning
 #: field:stock.planning,stock_start:0
 msgid "Initial Stock"
 msgstr ""
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
diff --git a/addons/stock_planning/i18n/pl.po b/addons/stock_planning/i18n/pl.po
index 344e5cb25f8..f8752693097 100644
--- a/addons/stock_planning/i18n/pl.po
+++ b/addons/stock_planning/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:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-09-29 11:33+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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_planning
@@ -52,16 +52,6 @@ msgstr "Ta firma Okres1"
 msgid "Group By..."
 msgstr "Grupuj wg..."
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Already Out: "
-msgstr ""
-"\n"
-" Już wydane: "
-
 #. module: stock_planning
 #: help:stock.sale.forecast,product_amt:0
 msgid ""
@@ -70,11 +60,6 @@ msgid ""
 msgstr ""
 "Wartość prognozy, która będzie skonwertowana do ilości według ceny produktu."
 
-#. module: stock_planning
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -151,6 +136,16 @@ msgstr "Utwórz okresy dniowe"
 msgid "Company"
 msgstr "Firma"
 
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Initial Stock: "
+msgstr ""
+"\n"
+" Zapas początkowy: "
+
 #. module: stock_planning
 #: help:stock.planning,warehouse_forecast:0
 msgid ""
@@ -201,16 +196,6 @@ msgstr ""
 msgid "Current Period Situation"
 msgstr "Sytuacja bieżącego okresu"
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Planned Out Before: "
-msgstr ""
-"\n"
-" Wcześniejsze planowane wydania: "
-
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create Monthly Periods"
@@ -349,9 +334,10 @@ msgid "Procure Incoming Left"
 msgstr "Zapotrzebowanie na brakujące przyjęcia"
 
 #. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Zamknięte"
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Incoming Left: "
+msgstr "    Brakujące przyjęcia: "
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -373,11 +359,6 @@ msgstr "Utwórz"
 msgid "Master Procurement Schedule"
 msgstr "Główny planista zapotrzebowania (MPS)"
 
-#. module: stock_planning
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Niewłaściwy XML dla architektury widoku!"
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -486,6 +467,16 @@ msgstr "Ręczne planowanie dla "
 msgid "This User"
 msgstr "Ten użytkownik"
 
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Confirmed Out: "
+msgstr ""
+"\n"
+" Potwierdzone wydania: "
+
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Forecasts"
@@ -540,22 +531,6 @@ msgstr "Musisz podac magazyn źródłowy !"
 msgid "Creates planning lines for selected period and warehouse."
 msgstr "Tworzy planowania dla wybranego Okresu i Magazynu."
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Warehouse Forecast: "
-msgstr ""
-"\n"
-" Prognoza Magazynu: "
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid "Cannot delete Validated Sale Forecasts !"
-msgstr "Nie mozna usuwać zatwierdzonych prognoz !"
-
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_user:0
 msgid "This User Period4"
@@ -593,6 +568,13 @@ msgstr ""
 msgid "Per User :"
 msgstr "Na użytkownika :"
 
+#. 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 "Prognozy sprzedaży"
+
 #. module: stock_planning
 #: field:stock.period,name:0
 #: field:stock.period.createlines,name:0
@@ -605,9 +587,9 @@ msgid "Created/Validated by"
 msgstr "Utworzył/Zatwierdził"
 
 #. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Prognoza dla magazynu"
+#: view:stock.planning:0
+msgid "Internal Supply"
+msgstr "Zapotrzebowanie wewnętrzne"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_company:0
@@ -619,16 +601,6 @@ msgstr "Ta firma Okres4"
 msgid "This Company Period5"
 msgstr "ta firma Okres5"
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Planned Out: "
-msgstr ""
-"\n"
-" Planowane wydania: "
-
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_company:0
 msgid "This Company Period2"
@@ -670,6 +642,11 @@ msgstr ""
 msgid "Planned Out"
 msgstr "Planowane wydania"
 
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Department :"
+msgstr "Na dział :"
+
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Forecast"
@@ -683,9 +660,9 @@ msgid "Draft"
 msgstr "Projekt"
 
 #. module: stock_planning
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
+#: view:stock.period:0
+msgid "Closed"
+msgstr "Zamknięte"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -694,9 +671,14 @@ msgid "Warehouse "
 msgstr "Magazyn "
 
 #. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "ten wydział Okres5"
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Expected Out: "
+msgstr ""
+"\n"
+" Spodziewane wydania: "
 
 #. module: stock_planning
 #: view:stock.period.createlines:0
@@ -716,15 +698,253 @@ msgstr ""
 "lub większa od Potwierdzone wydania."
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid "    Incoming Left: "
-msgstr "    Brakujące przyjęcia: "
+#: 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
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Zapotrzebowanie wewnętrzne"
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Cannot delete Validated Sale Forecasts !"
+msgstr "Nie mozna usuwać zatwierdzonych prognoz !"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Planned Out: "
+msgstr ""
+"\n"
+" Planowane wydania: "
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -788,16 +1008,6 @@ msgstr "Okres3"
 msgid "Period1"
 msgstr "Okres1"
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Initial Stock: "
-msgstr ""
-"\n"
-" Zapas początkowy: "
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -837,6 +1047,11 @@ msgstr "Planowanie i sytuacja dla obliczanego okresu"
 msgid "This Warehouse Period1"
 msgstr "Ten magazyn Okres1"
 
+#. module: stock_planning
+#: field:stock.planning,warehouse_forecast:0
+msgid "Warehouse Forecast"
+msgstr "Prognoza dla magazynu"
+
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -863,26 +1078,6 @@ msgstr "Ilość prognozowana"
 msgid "Stock"
 msgstr "Zapasy"
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Stock Simulation: "
-msgstr ""
-"\n"
-" Symulacja zapasu: "
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Confirmed Out: "
-msgstr ""
-"\n"
-" Potwierdzone wydania: "
-
 #. module: stock_planning
 #: field:stock.planning,stock_supply_location:0
 msgid "Stock Supply Location"
@@ -1007,12 +1202,9 @@ msgid "This Dept Period2"
 msgstr "Ten dział Okres2"
 
 #. module: stock_planning
-#: 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 !"
+#: field:stock.sale.forecast,analyzed_period5_per_dept:0
+msgid "This Dept Period5"
+msgstr "ten wydział Okres5"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_dept:0
@@ -1080,9 +1272,14 @@ msgid "Warehouse which planning will concern."
 msgstr "Magazyn, którego dotyczy planowanie."
 
 #. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Na firmę"
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Stock Simulation: "
+msgstr ""
+"\n"
+" Symulacja zapasu: "
 
 #. module: stock_planning
 #: help:stock.planning,to_procure:0
@@ -1120,10 +1317,10 @@ msgstr "Na magazyn :"
 #, python-format
 msgid ""
 "\n"
-"For period: "
+" Warehouse Forecast: "
 msgstr ""
 "\n"
-"Dla okresu: "
+" Prognoza Magazynu: "
 
 #. module: stock_planning
 #: field:stock.planning,history:0
@@ -1142,9 +1339,21 @@ msgid "    Planned In: "
 msgstr "    Planowane przyjęcia: "
 
 #. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Na dział :"
+#: field:stock.sale.forecast,analyze_company:0
+msgid "Per Company"
+msgstr "Na firmę"
+
+#. 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 ""
+"Ilość brakująca do Planowane przyjęcia. Jest to różnica pomiędzy Planowane "
+"przyjęcia i Potwierdzone przyjęcia. Dla bieżącego okresu Już przyjęte są "
+"również uwzględniane. Ta wartość jest stosowana do tworzenia zapotrzebowania "
+"na brakującą ilość."
 
 #. module: stock_planning
 #: help:stock.planning,incoming:0
@@ -1207,17 +1416,10 @@ msgstr "Produkt"
 #, python-format
 msgid ""
 "\n"
-" Expected Out: "
+"For period: "
 msgstr ""
 "\n"
-" Spodziewane wydania: "
-
-#. 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 "Prognozy sprzedaży"
+"Dla okresu: "
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_uom:0
@@ -1304,18 +1506,39 @@ msgid "Shows who created this forecast, or who validated."
 msgstr "Pokazuje kto utworzył lub kto zatwierdził prognozę."
 
 #. module: stock_planning
-#: help:stock.planning,incoming_left:0
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
 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."
+"\n"
+" Planned Out Before: "
 msgstr ""
-"Ilość brakująca do Planowane przyjęcia. Jest to różnica pomiędzy Planowane "
-"przyjęcia i Potwierdzone przyjęcia. Dla bieżącego okresu Już przyjęte są "
-"również uwzględniane. Ta wartość jest stosowana do tworzenia zapotrzebowania "
-"na brakującą ilość."
+"\n"
+" Wcześniejsze planowane wydania: "
 
 #. module: stock_planning
 #: field:stock.planning,stock_start:0
 msgid "Initial Stock"
 msgstr "Zapas początkowy"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Niewłaściwy XML dla architektury widoku!"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ " Already Out: "
+#~ msgstr ""
+#~ "\n"
+#~ " Już wydane: "
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
+
+#~ 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 !"
diff --git a/addons/stock_planning/i18n/pt.po b/addons/stock_planning/i18n/pt.po
index b677838281f..e5a262db535 100644
--- a/addons/stock_planning/i18n/pt.po
+++ b/addons/stock_planning/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-09 08:32+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-14 19:45+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <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-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_planning
@@ -114,7 +114,7 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create Daily Periods"
-msgstr ""
+msgstr "Driar períodos diários"
 
 #. module: stock_planning
 #: view:stock.planning:0
diff --git a/addons/stock_planning/i18n/pt_BR.po b/addons/stock_planning/i18n/pt_BR.po
index 1ac6c6c18fe..92e4ad6c0fe 100644
--- a/addons/stock_planning/i18n/pt_BR.po
+++ b/addons/stock_planning/i18n/pt_BR.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:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-08-31 08:17+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_planning
@@ -48,14 +48,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Already Out: "
-msgstr ""
-
 #. module: stock_planning
 #: help:stock.sale.forecast,product_amt:0
 msgid ""
@@ -63,11 +55,6 @@ msgid ""
 "prices."
 msgstr ""
 
-#. module: stock_planning
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -139,6 +126,14 @@ msgstr ""
 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 ""
@@ -184,14 +179,6 @@ msgstr ""
 msgid "Current Period Situation"
 msgstr ""
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Planned Out Before: "
-msgstr ""
-
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create Monthly Periods"
@@ -323,8 +310,9 @@ msgid "Procure Incoming Left"
 msgstr ""
 
 #. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Incoming Left: "
 msgstr ""
 
 #. module: stock_planning
@@ -347,11 +335,6 @@ msgstr ""
 msgid "Master Procurement Schedule"
 msgstr ""
 
-#. module: stock_planning
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -453,6 +436,14 @@ msgstr ""
 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"
@@ -506,20 +497,6 @@ msgstr ""
 msgid "Creates planning lines for selected period and warehouse."
 msgstr ""
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Warehouse Forecast: "
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid "Cannot delete Validated Sale Forecasts !"
-msgstr ""
-
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_user:0
 msgid "This User Period4"
@@ -554,6 +531,13 @@ msgstr ""
 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
@@ -566,8 +550,8 @@ msgid "Created/Validated by"
 msgstr ""
 
 #. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
+#: view:stock.planning:0
+msgid "Internal Supply"
 msgstr ""
 
 #. module: stock_planning
@@ -580,14 +564,6 @@ msgstr ""
 msgid "This Company Period5"
 msgstr ""
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Planned Out: "
-msgstr ""
-
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_company:0
 msgid "This Company Period2"
@@ -626,6 +602,11 @@ msgstr ""
 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"
@@ -639,8 +620,8 @@ msgid "Draft"
 msgstr ""
 
 #. module: stock_planning
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:stock.period:0
+msgid "Closed"
 msgstr ""
 
 #. module: stock_planning
@@ -650,8 +631,11 @@ msgid "Warehouse "
 msgstr ""
 
 #. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Expected Out: "
 msgstr ""
 
 #. module: stock_planning
@@ -668,14 +652,250 @@ msgid ""
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid "    Incoming Left: "
+#: 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
-#: view:stock.planning:0
-msgid "Internal Supply"
+#: 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
@@ -737,14 +957,6 @@ msgstr ""
 msgid "Period1"
 msgstr ""
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Initial Stock: "
-msgstr ""
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -784,6 +996,11 @@ msgstr ""
 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
@@ -810,22 +1027,6 @@ msgstr ""
 msgid "Stock"
 msgstr ""
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Stock Simulation: "
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Confirmed Out: "
-msgstr ""
-
 #. module: stock_planning
 #: field:stock.planning,stock_supply_location:0
 msgid "Stock Supply Location"
@@ -947,9 +1148,8 @@ msgid "This Dept Period2"
 msgstr ""
 
 #. module: stock_planning
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:stock.sale.forecast,analyzed_period5_per_dept:0
+msgid "This Dept Period5"
 msgstr ""
 
 #. module: stock_planning
@@ -1015,8 +1215,11 @@ msgid "Warehouse which planning will concern."
 msgstr ""
 
 #. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Stock Simulation: "
 msgstr ""
 
 #. module: stock_planning
@@ -1052,7 +1255,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"For period: "
+" Warehouse Forecast: "
 msgstr ""
 
 #. module: stock_planning
@@ -1072,8 +1275,16 @@ msgid "    Planned In: "
 msgstr ""
 
 #. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
+#: 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
@@ -1133,14 +1344,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-" Expected Out: "
-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"
+"For period: "
 msgstr ""
 
 #. module: stock_planning
@@ -1224,11 +1428,11 @@ msgid "Shows who created this forecast, or who validated."
 msgstr ""
 
 #. module: stock_planning
-#: help:stock.planning,incoming_left:0
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
 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."
+"\n"
+" Planned Out Before: "
 msgstr ""
 
 #. module: stock_planning
diff --git a/addons/stock_planning/i18n/ru.po b/addons/stock_planning/i18n/ru.po
index 1c954accb63..a290c8871af 100644
--- a/addons/stock_planning/i18n/ru.po
+++ b/addons/stock_planning/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:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
 "PO-Revision-Date: 2010-11-14 08:14+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-11-15 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_planning
@@ -48,14 +48,6 @@ msgstr ""
 msgid "Group By..."
 msgstr "Объединять по..."
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Already Out: "
-msgstr ""
-
 #. module: stock_planning
 #: help:stock.sale.forecast,product_amt:0
 msgid ""
@@ -63,11 +55,6 @@ msgid ""
 "prices."
 msgstr ""
 
-#. module: stock_planning
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -139,6 +126,14 @@ msgstr ""
 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 ""
@@ -184,14 +179,6 @@ msgstr ""
 msgid "Current Period Situation"
 msgstr ""
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Planned Out Before: "
-msgstr ""
-
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create Monthly Periods"
@@ -323,8 +310,9 @@ msgid "Procure Incoming Left"
 msgstr ""
 
 #. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Incoming Left: "
 msgstr ""
 
 #. module: stock_planning
@@ -347,11 +335,6 @@ msgstr ""
 msgid "Master Procurement Schedule"
 msgstr ""
 
-#. module: stock_planning
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -453,6 +436,14 @@ msgstr "Планирование вручную для "
 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"
@@ -506,20 +497,6 @@ msgstr ""
 msgid "Creates planning lines for selected period and warehouse."
 msgstr ""
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Warehouse Forecast: "
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid "Cannot delete Validated Sale Forecasts !"
-msgstr ""
-
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_user:0
 msgid "This User Period4"
@@ -554,6 +531,13 @@ msgstr ""
 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
@@ -566,8 +550,8 @@ msgid "Created/Validated by"
 msgstr "Создано/Утверждено"
 
 #. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
+#: view:stock.planning:0
+msgid "Internal Supply"
 msgstr ""
 
 #. module: stock_planning
@@ -580,14 +564,6 @@ msgstr ""
 msgid "This Company Period5"
 msgstr ""
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Planned Out: "
-msgstr ""
-
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_company:0
 msgid "This Company Period2"
@@ -626,6 +602,11 @@ msgstr ""
 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"
@@ -639,9 +620,9 @@ msgid "Draft"
 msgstr "Черновик"
 
 #. module: stock_planning
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Ошибка ! Нельзя создать зацикленные меню."
+#: view:stock.period:0
+msgid "Closed"
+msgstr ""
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -650,8 +631,11 @@ msgid "Warehouse "
 msgstr "Склад "
 
 #. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Expected Out: "
 msgstr ""
 
 #. module: stock_planning
@@ -668,14 +652,250 @@ msgid ""
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid "    Incoming Left: "
+#: 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
-#: view:stock.planning:0
-msgid "Internal Supply"
+#: 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
@@ -737,14 +957,6 @@ msgstr "Период3"
 msgid "Period1"
 msgstr "Период1"
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Initial Stock: "
-msgstr ""
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -784,6 +996,11 @@ msgstr ""
 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
@@ -810,22 +1027,6 @@ msgstr ""
 msgid "Stock"
 msgstr ""
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Stock Simulation: "
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid ""
-"\n"
-" Confirmed Out: "
-msgstr ""
-
 #. module: stock_planning
 #: field:stock.planning,stock_supply_location:0
 msgid "Stock Supply Location"
@@ -947,9 +1148,8 @@ msgid "This Dept Period2"
 msgstr ""
 
 #. module: stock_planning
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:stock.sale.forecast,analyzed_period5_per_dept:0
+msgid "This Dept Period5"
 msgstr ""
 
 #. module: stock_planning
@@ -1015,9 +1215,12 @@ msgid "Warehouse which planning will concern."
 msgstr ""
 
 #. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "По компании"
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Stock Simulation: "
+msgstr ""
 
 #. module: stock_planning
 #: help:stock.planning,to_procure:0
@@ -1052,10 +1255,8 @@ msgstr "По складу :"
 #, python-format
 msgid ""
 "\n"
-"For period: "
+" Warehouse Forecast: "
 msgstr ""
-"\n"
-"Для периода: "
 
 #. module: stock_planning
 #: field:stock.planning,history:0
@@ -1074,9 +1275,17 @@ msgid "    Planned In: "
 msgstr ""
 
 #. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "По отделу :"
+#: 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
@@ -1135,15 +1344,10 @@ msgstr "ТМЦ"
 #, python-format
 msgid ""
 "\n"
-" Expected Out: "
-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"
+"For period: "
 msgstr ""
+"\n"
+"Для периода: "
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_uom:0
@@ -1226,14 +1430,20 @@ msgid "Shows who created this forecast, or who validated."
 msgstr ""
 
 #. module: stock_planning
-#: help:stock.planning,incoming_left:0
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
 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."
+"\n"
+" Planned Out Before: "
 msgstr ""
 
 #. module: stock_planning
 #: field:stock.planning,stock_start:0
 msgid "Initial Stock"
 msgstr "Начальный остаток"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Недопустимое имя модели в определении действия."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ 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/ar.po b/addons/subscription/i18n/ar.po
index 0554aa7b7f9..5aebaabd38f 100644
--- a/addons/subscription/i18n/ar.po
+++ b/addons/subscription/i18n/ar.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/bg.po b/addons/subscription/i18n/bg.po
index e95e0a6e9ba..dee724c7737 100644
--- a/addons/subscription/i18n/bg.po
+++ b/addons/subscription/i18n/bg.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/bs.po b/addons/subscription/i18n/bs.po
index e733946b397..d55927de4f8 100644
--- a/addons/subscription/i18n/bs.po
+++ b/addons/subscription/i18n/bs.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/ca.po b/addons/subscription/i18n/ca.po
index e82de55e741..5727562d453 100644
--- a/addons/subscription/i18n/ca.po
+++ b/addons/subscription/i18n/ca.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/cs.po b/addons/subscription/i18n/cs.po
index 0c0a16e87e0..b6e07161d25 100644
--- a/addons/subscription/i18n/cs.po
+++ b/addons/subscription/i18n/cs.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/de.po b/addons/subscription/i18n/de.po
index 347cca0e599..239ccf17578 100644
--- a/addons/subscription/i18n/de.po
+++ b/addons/subscription/i18n/de.po
@@ -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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/es.po b/addons/subscription/i18n/es.po
index c817371227f..25588a070a9 100644
--- a/addons/subscription/i18n/es.po
+++ b/addons/subscription/i18n/es.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/es_AR.po b/addons/subscription/i18n/es_AR.po
index fe137d812ca..6737ddd4ed3 100644
--- a/addons/subscription/i18n/es_AR.po
+++ b/addons/subscription/i18n/es_AR.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/et.po b/addons/subscription/i18n/et.po
index cad5e6cb6f9..b92f0fc2121 100644
--- a/addons/subscription/i18n/et.po
+++ b/addons/subscription/i18n/et.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/fr.po b/addons/subscription/i18n/fr.po
index b317f362aca..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-14 05:00+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/hr.po b/addons/subscription/i18n/hr.po
index 0554aa7b7f9..5aebaabd38f 100644
--- a/addons/subscription/i18n/hr.po
+++ b/addons/subscription/i18n/hr.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/hu.po b/addons/subscription/i18n/hu.po
index 0554aa7b7f9..5aebaabd38f 100644
--- a/addons/subscription/i18n/hu.po
+++ b/addons/subscription/i18n/hu.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/id.po b/addons/subscription/i18n/id.po
index 10caf4448c1..e6bde71af83 100644
--- a/addons/subscription/i18n/id.po
+++ b/addons/subscription/i18n/id.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/it.po b/addons/subscription/i18n/it.po
index 83c9e4e789a..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-14 05:00+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/ko.po b/addons/subscription/i18n/ko.po
index 45c4d4fff30..3e3b37a0be1 100644
--- a/addons/subscription/i18n/ko.po
+++ b/addons/subscription/i18n/ko.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/lt.po b/addons/subscription/i18n/lt.po
index 2034634fa8f..26ede57a61a 100644
--- a/addons/subscription/i18n/lt.po
+++ b/addons/subscription/i18n/lt.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/nl.po b/addons/subscription/i18n/nl.po
index 262047286c0..7ffbee99005 100644
--- a/addons/subscription/i18n/nl.po
+++ b/addons/subscription/i18n/nl.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/nl_BE.po b/addons/subscription/i18n/nl_BE.po
index 367c91d0776..8b09463b7d6 100644
--- a/addons/subscription/i18n/nl_BE.po
+++ b/addons/subscription/i18n/nl_BE.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/pl.po b/addons/subscription/i18n/pl.po
index ab00fa33573..515531e1dae 100644
--- a/addons/subscription/i18n/pl.po
+++ b/addons/subscription/i18n/pl.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/pt.po b/addons/subscription/i18n/pt.po
index 26246cccd2f..a36d16e0ef0 100644
--- a/addons/subscription/i18n/pt.po
+++ b/addons/subscription/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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/pt_BR.po b/addons/subscription/i18n/pt_BR.po
index 0c7217d6f8e..52962464d38 100644
--- a/addons/subscription/i18n/pt_BR.po
+++ b/addons/subscription/i18n/pt_BR.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/ro.po b/addons/subscription/i18n/ro.po
index 0554aa7b7f9..5aebaabd38f 100644
--- a/addons/subscription/i18n/ro.po
+++ b/addons/subscription/i18n/ro.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/ru.po b/addons/subscription/i18n/ru.po
index eec170fdd35..e19c2f90770 100644
--- a/addons/subscription/i18n/ru.po
+++ b/addons/subscription/i18n/ru.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/sl.po b/addons/subscription/i18n/sl.po
index 2bbffb9bb00..ea7f7b38c36 100644
--- a/addons/subscription/i18n/sl.po
+++ b/addons/subscription/i18n/sl.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/sq.po b/addons/subscription/i18n/sq.po
index c0c6bae9f3e..da62043c576 100644
--- a/addons/subscription/i18n/sq.po
+++ b/addons/subscription/i18n/sq.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-14 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
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/i18n/sv.po b/addons/subscription/i18n/sv.po
index 51e712baf17..dd7df779b3e 100644
--- a/addons/subscription/i18n/sv.po
+++ b/addons/subscription/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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/tlh.po b/addons/subscription/i18n/tlh.po
index 37261d4a986..9a01c7a189a 100644
--- a/addons/subscription/i18n/tlh.po
+++ b/addons/subscription/i18n/tlh.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/tr.po b/addons/subscription/i18n/tr.po
index 0320f5bb552..524041abab7 100644
--- a/addons/subscription/i18n/tr.po
+++ b/addons/subscription/i18n/tr.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/uk.po b/addons/subscription/i18n/uk.po
index 0aac0cab979..0b31bfe728c 100644
--- a/addons/subscription/i18n/uk.po
+++ b/addons/subscription/i18n/uk.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/vi.po b/addons/subscription/i18n/vi.po
index 5a1456d83da..60a080b7543 100644
--- a/addons/subscription/i18n/vi.po
+++ b/addons/subscription/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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/zh_CN.po b/addons/subscription/i18n/zh_CN.po
index 4ae83525503..46f25d1a8fd 100644
--- a/addons/subscription/i18n/zh_CN.po
+++ b/addons/subscription/i18n/zh_CN.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/zh_TW.po b/addons/subscription/i18n/zh_TW.po
index 160a63e2578..66b22d3c0c6 100644
--- a/addons/subscription/i18n/zh_TW.po
+++ b/addons/subscription/i18n/zh_TW.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-14 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
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 fac6d8a893f..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-12 10:31+0000\n"
-"Last-Translator: swinter <Unknown>\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-14 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: survey
@@ -31,17 +31,19 @@ msgid ""
 "greater than the number of answer.                                      "
 "Please use a number that is smaller than %d."
 msgstr ""
+"Le nombre minimum de réponses que vous avez saisi est plus grand que le "
+"nombre de réponses. Veuillez saisir un nombre plus petit que %d."
 
 #. module: survey
 #: view:survey.question.wiz:0
 msgid "Your Messages"
-msgstr ""
+msgstr "Vos messages"
 
 #. module: survey
 #: field:survey.question,comment_valid_type:0
 #: field:survey.question,validation_type:0
 msgid "Text Validation"
-msgstr ""
+msgstr "Validation du texte"
 
 #. module: survey
 #: code:addons/survey/survey.py:0
@@ -58,7 +60,7 @@ msgstr ""
 #: view:survey:0
 #: field:survey,invited_user_ids:0
 msgid "Invited User"
-msgstr ""
+msgstr "Invité"
 
 #. module: survey
 #: selection:survey.answer,type:0
@@ -72,7 +74,7 @@ msgstr ""
 #: model:ir.ui.menu,name:survey.menu_survey_form
 #: model:ir.ui.menu,name:survey.menu_surveys
 msgid "Surveys"
-msgstr ""
+msgstr "Sondages"
 
 #. module: survey
 #: view:survey:0
@@ -95,12 +97,12 @@ msgstr ""
 #. module: survey
 #: view:survey.send.invitation.log:0
 msgid "Results :"
-msgstr ""
+msgstr "Résultats :"
 
 #. module: survey
 #: view:survey.request:0
 msgid "Survey Request"
-msgstr ""
+msgstr "Demande de sondage"
 
 #. module: survey
 #: selection:survey.question,required_type:0
@@ -110,17 +112,17 @@ msgstr ""
 #. module: survey
 #: view:survey.response.line:0
 msgid "Table Answer"
-msgstr ""
+msgstr "Tableau des réponses"
 
 #. module: survey
 #: field:survey.history,date:0
 msgid "Date started"
-msgstr ""
+msgstr "Date de démarrage"
 
 #. module: survey
 #: field:survey,history:0
 msgid "History Lines"
-msgstr ""
+msgstr "Lignes d'historique"
 
 #. module: survey
 #: code:addons/survey/survey.py:0
@@ -129,21 +131,23 @@ msgid ""
 "You must enter one or more menu                                 choices in "
 "column heading (white spaces not allowed)"
 msgstr ""
+"Vous devez saisir un ou plusieurs choix dans l'en-tête de colonne (les "
+"espaces ne sont pas autorisés)."
 
 #. module: survey
 #: field:survey.question.column.heading,in_visible_menu_choice:0
 msgid "Is Menu Choice Invisible??"
-msgstr ""
+msgstr "Le choix du menu est-il 'Invisible' ?"
 
 #. module: survey
 #: field:survey.send.invitation,mail:0
 msgid "Body"
-msgstr ""
+msgstr "Corps"
 
 #. module: survey
 #: field:survey.question,allow_comment:0
 msgid "Allow Comment Field"
-msgstr ""
+msgstr "Autoriser le champ 'Commentaire'"
 
 #. module: survey
 #: selection:survey.print,paper_size:0
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/bg.po b/addons/thunderbird/i18n/bg.po
index e107fd84ef7..b7d8d55ea3a 100644
--- a/addons/thunderbird/i18n/bg.po
+++ b/addons/thunderbird/i18n/bg.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/cs.po b/addons/thunderbird/i18n/cs.po
index 1e715c61fc9..f2118abdf1e 100644
--- a/addons/thunderbird/i18n/cs.po
+++ b/addons/thunderbird/i18n/cs.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/de.po b/addons/thunderbird/i18n/de.po
index d7737d13fc0..5cad2af31a6 100644
--- a/addons/thunderbird/i18n/de.po
+++ b/addons/thunderbird/i18n/de.po
@@ -16,7 +16,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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/en_GB.po b/addons/thunderbird/i18n/en_GB.po
index 8bb60f96ed3..eb3c193a718 100644
--- a/addons/thunderbird/i18n/en_GB.po
+++ b/addons/thunderbird/i18n/en_GB.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/es.po b/addons/thunderbird/i18n/es.po
index 857bd61e9e2..6edbbca462b 100644
--- a/addons/thunderbird/i18n/es.po
+++ b/addons/thunderbird/i18n/es.po
@@ -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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/et.po b/addons/thunderbird/i18n/et.po
index 0603b7939b7..5b1a6aa6a7f 100644
--- a/addons/thunderbird/i18n/et.po
+++ b/addons/thunderbird/i18n/et.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/eu.po b/addons/thunderbird/i18n/eu.po
index b37f6c936f4..661a56ec2fa 100644
--- a/addons/thunderbird/i18n/eu.po
+++ b/addons/thunderbird/i18n/eu.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/fr.po b/addons/thunderbird/i18n/fr.po
index 4b9142ce0ee..6c995ab80cf 100644
--- a/addons/thunderbird/i18n/fr.po
+++ b/addons/thunderbird/i18n/fr.po
@@ -8,35 +8,36 @@ 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-16 08:33+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\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-14 05:33+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
 msgid "Installation Manual"
-msgstr ""
+msgstr "Manuel d'installation"
 
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurer"
 
 #. module: thunderbird
 #: model:ir.model,name:thunderbird.model_thunderbird_installer
 msgid "thunderbird.installer"
-msgstr ""
+msgstr "thunderbird.installer"
 
 #. module: thunderbird
 #: field:thunderbird.installer,description:0
@@ -46,33 +47,33 @@ msgstr "Description"
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "title"
-msgstr ""
+msgstr "titre"
 
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "Skip"
-msgstr ""
+msgstr "Passer"
 
 #. module: thunderbird
 #: field:thunderbird.installer,name:0
 #: field:thunderbird.installer,pdf_name:0
 msgid "File name"
-msgstr ""
+msgstr "Nom du fichier"
 
 #. module: thunderbird
 #: model:ir.model,name:thunderbird.model_thunderbird_partner
 msgid "Thunderbid mails"
-msgstr "Messagerie Thunderbird"
+msgstr "Courriels Thunderbird"
 
 #. module: thunderbird
 #: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
 msgid "Thunderbird Plug-In"
-msgstr ""
+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,12 +109,12 @@ 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
 msgid "Image"
-msgstr ""
+msgstr "Image"
 
 #. module: thunderbird
 #: help:thunderbird.installer,plugin_file: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/hr.po b/addons/thunderbird/i18n/hr.po
index 4defbebdd4a..39c613de339 100644
--- a/addons/thunderbird/i18n/hr.po
+++ b/addons/thunderbird/i18n/hr.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/thunderbird/i18n/it.po b/addons/thunderbird/i18n/it.po
index 264007255f4..dd3a2a913d2 100644
--- a/addons/thunderbird/i18n/it.po
+++ b/addons/thunderbird/i18n/it.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/mn.po b/addons/thunderbird/i18n/mn.po
index aed63f8b567..f00b4d3048d 100644
--- a/addons/thunderbird/i18n/mn.po
+++ b/addons/thunderbird/i18n/mn.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/nl.po b/addons/thunderbird/i18n/nl.po
index 4680a47dacc..a873fc153ed 100644
--- a/addons/thunderbird/i18n/nl.po
+++ b/addons/thunderbird/i18n/nl.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/pl.po b/addons/thunderbird/i18n/pl.po
index 0f388e2c0fa..da3bb53ddd7 100644
--- a/addons/thunderbird/i18n/pl.po
+++ b/addons/thunderbird/i18n/pl.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/pt.po b/addons/thunderbird/i18n/pt.po
index 5a4435092f5..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-03 07:49+0000\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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
@@ -36,7 +36,7 @@ msgstr "Configurar"
 #. module: thunderbird
 #: model:ir.model,name:thunderbird.model_thunderbird_installer
 msgid "thunderbird.installer"
-msgstr ""
+msgstr "thunderbird.installer"
 
 #. module: thunderbird
 #: field:thunderbird.installer,description:0
@@ -62,7 +62,7 @@ msgstr "Nome do ficheiro"
 #. module: thunderbird
 #: model:ir.model,name:thunderbird.model_thunderbird_partner
 msgid "Thunderbid mails"
-msgstr ""
+msgstr "Correio do Thunderbird"
 
 #. module: thunderbird
 #: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
@@ -98,7 +98,7 @@ msgstr ""
 #. module: thunderbird
 #: model:ir.model,name:thunderbird.model_email_server_tools
 msgid "Email Server Tools"
-msgstr ""
+msgstr "Ferramentas do servidor de correio"
 
 #. module: thunderbird
 #: model:ir.module.module,shortdesc:thunderbird.module_meta_information
@@ -121,6 +121,8 @@ msgid ""
 "Thunderbird plug-in file. Save as this file and install this plug-in in "
 "thunderbird."
 msgstr ""
+"Ficheiro do 'plug-in' para o Thunderbird. Guarde este ficheiro e instale "
+"este 'plug-in' no Thunderbird."
 
 #. module: thunderbird
 #: field:thunderbird.installer,progress:0
diff --git a/addons/thunderbird/i18n/pt_BR.po b/addons/thunderbird/i18n/pt_BR.po
index c0d76282001..f0714998dc8 100644
--- a/addons/thunderbird/i18n/pt_BR.po
+++ b/addons/thunderbird/i18n/pt_BR.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/ru.po b/addons/thunderbird/i18n/ru.po
index 78b2b6e7977..65d1018ee15 100644
--- a/addons/thunderbird/i18n/ru.po
+++ b/addons/thunderbird/i18n/ru.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/sk.po b/addons/thunderbird/i18n/sk.po
index a66fcc255a5..9a9990c2a5a 100644
--- a/addons/thunderbird/i18n/sk.po
+++ b/addons/thunderbird/i18n/sk.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/sl.po b/addons/thunderbird/i18n/sl.po
index 759fb72a025..7136fdad0c0 100644
--- a/addons/thunderbird/i18n/sl.po
+++ b/addons/thunderbird/i18n/sl.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/sr.po b/addons/thunderbird/i18n/sr.po
index 729eb88b667..706e9f7ccd3 100644
--- a/addons/thunderbird/i18n/sr.po
+++ b/addons/thunderbird/i18n/sr.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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:16+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 231b693f49b..45d13f84498 100644
--- a/addons/thunderbird/i18n/zh_CN.po
+++ b/addons/thunderbird/i18n/zh_CN.po
@@ -8,35 +8,35 @@ 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-04-28 19:35+0000\n"
-"Last-Translator: Luis Miguel D.P. <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-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+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 "Thunderbird 插件设置"
 
 #. module: thunderbird
 #: field:thunderbird.installer,pdf_file:0
 msgid "Installation Manual"
-msgstr ""
+msgstr "安装手册"
 
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "设置"
 
 #. module: thunderbird
 #: model:ir.model,name:thunderbird.model_thunderbird_installer
 msgid "thunderbird.installer"
-msgstr ""
+msgstr "thunderbird.installer"
 
 #. module: thunderbird
 #: field:thunderbird.installer,description:0
@@ -46,18 +46,18 @@ msgstr "描述"
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "title"
-msgstr ""
+msgstr "标题"
 
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "Skip"
-msgstr ""
+msgstr "略过"
 
 #. module: thunderbird
 #: field:thunderbird.installer,name:0
 #: field:thunderbird.installer,pdf_name:0
 msgid "File name"
-msgstr ""
+msgstr "文件名"
 
 #. module: thunderbird
 #: model:ir.model,name:thunderbird.model_thunderbird_partner
@@ -67,12 +67,12 @@ msgstr "Thunderbid邮件"
 #. module: thunderbird
 #: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
 msgid "Thunderbird Plug-In"
-msgstr ""
+msgstr "Thunderbird 插件"
 
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "_Close"
-msgstr ""
+msgstr "关闭(_C)"
 
 #. module: thunderbird
 #: help:thunderbird.installer,thunderbird:0
@@ -85,17 +85,17 @@ msgstr ""
 #: field:thunderbird.installer,plugin_file:0
 #: field:thunderbird.installer,thunderbird:0
 msgid "Thunderbird Plug-in"
-msgstr ""
+msgstr "Thunderbird 插件"
 
 #. module: thunderbird
 #: help:thunderbird.installer,pdf_file:0
 msgid "The documentation file :- how to install Thunderbird Plug-in."
-msgstr ""
+msgstr "文件 :- 如何安装 Thunderbird 插件。"
 
 #. module: thunderbird
 #: model:ir.model,name:thunderbird.model_email_server_tools
 msgid "Email Server Tools"
-msgstr ""
+msgstr "邮件服务器工具"
 
 #. module: thunderbird
 #: model:ir.module.module,shortdesc:thunderbird.module_meta_information
@@ -105,24 +105,24 @@ msgstr "Thunderbird接口"
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "Installation and Configuration Steps"
-msgstr ""
+msgstr "安装和设置步骤"
 
 #. module: thunderbird
 #: field:thunderbird.installer,config_logo:0
 msgid "Image"
-msgstr ""
+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 ""
+msgstr "Thunderbird 插件。存为文件并在 Thunderbird 里安装这个插件。"
 
 #. module: thunderbird
 #: field:thunderbird.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "设置进度"
 
 #~ msgid "Reference"
 #~ msgstr "参考"
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/fr.po b/addons/users_ldap/i18n/fr.po
new file mode 100644
index 00000000000..307d8de67b6
--- /dev/null
+++ b/addons/users_ldap/i18n/fr.po
@@ -0,0 +1,123 @@
+# French 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-14 21:05+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:21+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: users_ldap
+#: view:res.company:0
+msgid "LDAP Configuration"
+msgstr "Configuration LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Sociétés"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Société"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr ""
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erreur! Vous ne pouvez pas créer de sociétés récursives"
+
+#. module: users_ldap
+#: model:ir.module.module,shortdesc:users_ldap.module_meta_information
+msgid "Authenticate users with ldap server"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr ""
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "La société choisie n'est pas autorisée pour cet utilisateur."
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Séquence"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Créer un utilisateur"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Vous ne pouvez pas avoir deux utilisateurs avec le même login !"
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/users_ldap/users_ldap.py b/addons/users_ldap/users_ldap.py
index df4528107cc..2c590242889 100644
--- a/addons/users_ldap/users_ldap.py
+++ b/addons/users_ldap/users_ldap.py
@@ -21,6 +21,7 @@
 from osv import fields, osv
 import pooler
 import tools
+import logging
 from service import security
 import ldap
 from ldap.filter import filter_format
@@ -66,9 +67,9 @@ class users(osv.osv):
     _inherit = "res.users"
     def login(self, db, login, password):
         ret = super(users,self).login(db, login, password)
-        tools.debug(ret)
         if ret:
             return ret
+        logger = logging.getLogger('orm.ldap')
         pool = pooler.get_pool(db)
         cr = pooler.get_db(db).cursor()
         action_obj = pool.get('ir.actions.actions')
@@ -78,7 +79,7 @@ class users(osv.osv):
             FROM res_company_ldap
             WHERE ldap_server != '' and ldap_binddn != '' ORDER BY sequence""")
         for res_company_ldap in cr.dictfetchall():
-            tools.debug(res_company_ldap)
+            logger.debug(res_company_ldap)
             try:
                 l = ldap.open(res_company_ldap['ldap_server'], res_company_ldap['ldap_server_port'])
                 if l.simple_bind_s(res_company_ldap['ldap_binddn'], res_company_ldap['ldap_password']):
@@ -93,13 +94,13 @@ class users(osv.osv):
                         continue
                     if result_type == ldap.RES_SEARCH_RESULT and len(result_data) == 1:
                         dn = result_data[0][0]
-                        tools.debug(dn)
+                        logger.debug(dn)
                         name = result_data[0][1]['cn'][0]
                         if l.bind_s(dn, password):
                             l.unbind()
                             cr.execute("SELECT id FROM res_users WHERE login=%s",(tools.ustr(login),))
                             res = cr.fetchone()
-                            tools.debug(res)
+                            logger.debug(res)
                             if res:
                                 cr.close()
                                 return res[0]
@@ -127,7 +128,7 @@ class users(osv.osv):
                             return res
                     l.unbind()
             except Exception, e:
-                tools.debug(e)
+                logger.warning("Cannot auth", exc_info=True)
                 continue
         cr.close()
         return False
@@ -135,10 +136,11 @@ class users(osv.osv):
     def check(self, db, uid, passwd):
         try:
             return super(users,self).check(db, uid, passwd)
-        except: # AccessDenied
+        except security.ExceptionNoTb: # AccessDenied
             pass
         cr = pooler.get_db(db).cursor()
         user = self.browse(cr, 1, uid)
+        logger = logging.getLogger('orm.ldap')
         if user and user.company_id.ldaps:
             for res_company_ldap in user.company_id.ldaps:
                 try:
@@ -161,7 +163,7 @@ class users(osv.osv):
                                 return True
                         l.unbind()
                 except Exception, e:
-                    tools.debug(e)
+                    logger.warning('cannot check', exc_info=True)
                     pass
         cr.close()
         raise security.ExceptionNoTb('AccessDenied')
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 29553ffe673..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-01 14:11+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\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-14 05:31+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
@@ -36,16 +37,17 @@ msgstr "Message pour Ligne de Commande Fournisseur"
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
 msgstr ""
+"Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
 
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Liste de colisage"
 
 #. module: warning
 #: constraint:account.invoice:0
 msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
+msgstr "Erreur : Nombre BVR non valide (somme de contrôle fausse)."
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
@@ -183,7 +185,7 @@ msgstr ""
 #. module: warning
 #: constraint:account.invoice:0
 msgid "Error: BVR reference is required."
-msgstr ""
+msgstr "Erreur: la référence BVR est requise."
 
 #. module: warning
 #: view:res.partner:0
@@ -199,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
@@ -209,7 +211,7 @@ msgstr "Avertissement sur les Commandes de Ventes"
 #. module: warning
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Erreur: Code EAN invalide"
 
 #. module: warning
 #: field:res.partner,picking_warn_msg:0
diff --git a/addons/warning/i18n/pt.po b/addons/warning/i18n/pt.po
index a973b0b90e7..fd7b8feccfb 100644
--- a/addons/warning/i18n/pt.po
+++ b/addons/warning/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-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-12 18:01+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2010-12-14 22:43+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:31+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
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/web_livechat/LICENSE b/addons/web_livechat/LICENSE
new file mode 100644
index 00000000000..27a1a4cf453
--- /dev/null
+++ b/addons/web_livechat/LICENSE
@@ -0,0 +1,15 @@
+OpenERP, Open Source Management Solution
+Copyright © 2010 OpenERP SA (<http://openerp.com>).
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public Lice
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/addons/web_livechat/__init__.py b/addons/web_livechat/__init__.py
new file mode 100644
index 00000000000..9af39b2f58c
--- /dev/null
+++ b/addons/web_livechat/__init__.py
@@ -0,0 +1,20 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import publisher_warranty
diff --git a/addons/web_livechat/__openerp__.py b/addons/web_livechat/__openerp__.py
new file mode 100644
index 00000000000..d744a16dd65
--- /dev/null
+++ b/addons/web_livechat/__openerp__.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': 'Live Chat Support',
+    'version': '1.0',
+    'category': 'Generic Modules/Others',
+    'description': "Enable live chat support for whom have a maintenance contract",
+    'author': 'OpenERP s.a.',
+    'website': 'http://openerp.com',
+    'depends': ['base'],
+    'update_xml': [],
+    'installable': True,
+    'active': True,
+    'web': True,
+    'certificate': '0013762192410413',
+}
diff --git a/addons/web_livechat/publisher_warranty.py b/addons/web_livechat/publisher_warranty.py
new file mode 100644
index 00000000000..b4825febcf6
--- /dev/null
+++ b/addons/web_livechat/publisher_warranty.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from tools import cache
+
+class publisher_warranty_contract(osv.osv):
+    _inherit = 'publisher_warranty.contract'
+
+    @cache(skiparg=3, timeout=300)
+    def is_livechat_enable(self, cr, uid):
+        domain = [('state', '=', 'valid'), ('kind', '=', 'support')]
+        return self.search_count(cr, uid, domain) != 0
+
+    @cache(skiparg=3)
+    def get_default_livechat_text(self, cr, uid):
+        return '<a href="http://www.openerp.com/services/subscribe-onsite" target="_blank"><img src="/web_livechat/static/images/busy.png"/>Online Support</a>'
+
+publisher_warranty_contract()
+
diff --git a/addons/web_livechat/web/__init__.py b/addons/web_livechat/web/__init__.py
new file mode 100644
index 00000000000..ec026b194f1
--- /dev/null
+++ b/addons/web_livechat/web/__init__.py
@@ -0,0 +1,5 @@
+##############################################################################
+# This file is part of the "web-livechatinc-odoo" OpenERP module.
+# See LICENCE file at the root of the module folder.
+##############################################################################
+import editors
diff --git a/addons/web_livechat/web/editors.py b/addons/web_livechat/web/editors.py
new file mode 100644
index 00000000000..9b653312415
--- /dev/null
+++ b/addons/web_livechat/web/editors.py
@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import openobject.templating
+
+class BaseTemplateEditor(openobject.templating.TemplateEditor):
+    templates = ['/openobject/controllers/templates/base.mako']
+
+    def edit(self, template, template_text):
+        output = super(BaseTemplateEditor, self).edit(template, template_text)
+
+        end_head = output.index('</head>')
+
+        output = output[:end_head] + """
+    <link rel="stylesheet" type="text/css" href="/web_livechat/static/css/lc.css"/>
+    <%
+        if 'livechat' not in cp.session:
+            cp.session['livechat'] = rpc.session.execute('object', 'execute', 'publisher_warranty.contract', 'is_livechat_enable')
+    %>
+    % if cp.session['livechat']:
+<script type="text/javascript">
+
+  (function() {
+    var lc_params = '';
+    var lc_lang = 'en';
+    var lc_skill = '0';
+
+    var lc = document.createElement('script'); lc.type = 'text/javascript'; lc.async = true;
+    var lc_src = ('https:' == document.location.protocol ? 'https://' : 'http://');
+        lc_src += 'chat.livechatinc.net/licence/1035052/script.cgi?lang='+lc_lang+unescape('%26')+'groups='+lc_skill;
+        lc_src += ((lc_params == '') ? '' : unescape('%26')+'params='+encodeURIComponent(encodeURIComponent(lc_params))); lc.src = lc_src;
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(lc, s);
+  })();
+
+</script>
+    % endif
+        """ + output[end_head:]
+
+        return output
+
+
+class HeaderTemplateEditor(openobject.templating.TemplateEditor):
+    templates = ['/openerp/controllers/templates/header.mako']
+
+
+    def edit(self, template, template_text):
+        output = super(HeaderTemplateEditor, self).edit(template, template_text)
+
+        PATTERN = '<div id="corner">'
+        corner = output.index(PATTERN) + len(PATTERN)
+
+
+        output = output[:corner] + """
+            <p id="livechat_status" class="logout">
+                ${ rpc.session.execute('object', 'execute', 'publisher_warranty.contract', 'get_default_livechat_text') | n}
+            </p>
+            % if cp.session['livechat']:
+
+                <script type="text/javascript">
+                  var __lc_buttons = __lc_buttons || [];
+                  __lc_buttons.push({
+                    elementId: 'livechat_status',
+                    language: 'en',
+                    skill: '0',
+                    type: 'text',
+                    labels: {
+                      online: '<img src="/web_livechat/static/images/available.png"/>Online Support',
+                      offline: '<img src="/web_livechat/static/images/away.png"/>Online Support'
+                    }
+                  });
+                </script>
+
+            % endif
+        """ + output[corner:]
+        return output
+
diff --git a/addons/web_livechat/web/static/css/lc.css b/addons/web_livechat/web/static/css/lc.css
new file mode 100644
index 00000000000..e6892857ddd
--- /dev/null
+++ b/addons/web_livechat/web/static/css/lc.css
@@ -0,0 +1,7 @@
+#livechat_status a.online {
+    text-shadow: 0 0 0.2em #9a0404, 0 0 0.2em #9a0404, 0 0 0.2em #9a0404, 0 0 0.2em #9a0404;
+}
+#livechat_status img {
+    vertical-align: middle;
+    margin-right: 0.5em;
+}
diff --git a/addons/wiki/i18n/fr.po b/addons/wiki/i18n/fr.po
index 95d56e130e0..7f454bcb991 100644
--- a/addons/wiki/i18n/fr.po
+++ b/addons/wiki/i18n/fr.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-04 09:36+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\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-14 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
@@ -118,7 +117,7 @@ msgstr "Titre"
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_create_menu
 msgid "Wizard Create Menu"
-msgstr ""
+msgstr "Menu de création d'un wizard"
 
 #. module: wiki
 #: field:wiki.wiki,history_id:0
@@ -128,13 +127,13 @@ msgstr "Historique des lignes"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Page Content"
-msgstr ""
+msgstr "Contenu de la page"
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Attention !"
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:0
@@ -183,7 +182,7 @@ msgstr ""
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "Tree"
-msgstr ""
+msgstr "Arbre"
 
 #. module: wiki
 #: view:wiki.groups:0
@@ -193,7 +192,7 @@ msgstr "Modèle de page"
 #. module: wiki
 #: field:wiki.wiki,tags:0
 msgid "Keywords"
-msgstr ""
+msgstr "Mots-clés"
 
 #. module: wiki
 #: code:addons/wiki/wizard/wiki_show_diff.py:0
@@ -256,7 +255,7 @@ msgstr "Zone de texte"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Meta Information"
-msgstr ""
+msgstr "Méta-information"
 
 #. module: wiki
 #: field:wiki.wiki,create_date:0
@@ -272,7 +271,7 @@ msgstr "Notes"
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "List"
-msgstr ""
+msgstr "Liste"
 
 #. module: wiki
 #: field:wiki.wiki,summary:0
@@ -303,7 +302,7 @@ msgstr ""
 #. module: wiki
 #: view:wizard.wiki.history.show_diff:0
 msgid "Close"
-msgstr ""
+msgstr "Fermer"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wizard_wiki_history_show_diff
@@ -319,7 +318,7 @@ msgstr "ID Wiki"
 #: field:wiki.groups,home:0
 #: selection:wiki.groups,method:0
 msgid "Home Page"
-msgstr ""
+msgstr "Page d'accueil"
 
 #. module: wiki
 #: help:wiki.wiki,parent_id:0
@@ -366,7 +365,7 @@ msgstr ""
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grouper par ..."
 
 #. module: wiki
 #: model:ir.actions.act_window,help:wiki.action_wiki
@@ -402,7 +401,7 @@ msgstr "Groupes wiki"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Topic"
-msgstr ""
+msgstr "Sujet"
 
 #. module: wiki
 #: field:wiki.wiki.history,write_uid:0
@@ -452,7 +451,7 @@ msgstr ""
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_group_open
 msgid "Search Page"
-msgstr ""
+msgstr "Page de recherche"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
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"